diff options
author | Mark Tiefenbruck <mark@fluxbox.org> | 2008-01-05 01:39:19 (GMT) |
---|---|---|
committer | Mark Tiefenbruck <mark@fluxbox.org> | 2008-01-05 01:39:19 (GMT) |
commit | ac1bd7e0981222bf340ce7defb2bb8307d42a0a2 (patch) | |
tree | c8fb9c618184e7ac44f6138409cab3fab86b23e4 /src/FbWinFrame.hh | |
parent | 60ba709c2f47cc2c7b877aef1b0f297b097853e5 (diff) | |
download | fluxbox-ac1bd7e0981222bf340ce7defb2bb8307d42a0a2.zip fluxbox-ac1bd7e0981222bf340ce7defb2bb8307d42a0a2.tar.bz2 |
update code to use ThemeProxy
Diffstat (limited to 'src/FbWinFrame.hh')
-rw-r--r-- | src/FbWinFrame.hh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh index 5d81dba..82c33dc 100644 --- a/src/FbWinFrame.hh +++ b/src/FbWinFrame.hh | |||
@@ -46,6 +46,7 @@ class ImageControl; | |||
46 | class Command; | 46 | class Command; |
47 | class Texture; | 47 | class Texture; |
48 | class XLayer; | 48 | class XLayer; |
49 | template <class T> class ThemeProxy; | ||
49 | } | 50 | } |
50 | 51 | ||
51 | /// holds a window frame with a client window | 52 | /// holds a window frame with a client window |
@@ -95,7 +96,8 @@ public: | |||
95 | }; | 96 | }; |
96 | 97 | ||
97 | /// create a top level window | 98 | /// create a top level window |
98 | FbWinFrame(BScreen &screen, FbWinFrameTheme &theme, FbTk::ImageControl &imgctrl, | 99 | FbWinFrame(BScreen &screen, FbTk::ThemeProxy<FbWinFrameTheme> &theme, |
100 | FbTk::ImageControl &imgctrl, | ||
99 | FbTk::XLayer &layer, | 101 | FbTk::XLayer &layer, |
100 | int x, int y, | 102 | int x, int y, |
101 | unsigned int width, unsigned int height); | 103 | unsigned int width, unsigned int height); |
@@ -254,7 +256,7 @@ public: | |||
254 | const IconButton *currentLabel() const { return m_current_label; } | 256 | const IconButton *currentLabel() const { return m_current_label; } |
255 | bool focused() const { return m_focused; } | 257 | bool focused() const { return m_focused; } |
256 | bool isShaded() const { return m_shaded; } | 258 | bool isShaded() const { return m_shaded; } |
257 | FbWinFrameTheme &theme() const { return m_theme; } | 259 | FbTk::ThemeProxy<FbWinFrameTheme> &theme() const { return m_theme; } |
258 | /// @return titlebar height | 260 | /// @return titlebar height |
259 | unsigned int titlebarHeight() const { return (m_use_titlebar?m_titlebar.height()+m_window.borderWidth():0); } | 261 | unsigned int titlebarHeight() const { return (m_use_titlebar?m_titlebar.height()+m_window.borderWidth():0); } |
260 | unsigned int handleHeight() const { return (m_use_handle?m_handle.height()+m_window.borderWidth():0); } | 262 | unsigned int handleHeight() const { return (m_use_handle?m_handle.height()+m_window.borderWidth():0); } |
@@ -313,7 +315,7 @@ private: | |||
313 | 315 | ||
314 | BScreen &m_screen; | 316 | BScreen &m_screen; |
315 | 317 | ||
316 | FbWinFrameTheme &m_theme; ///< theme to be used | 318 | FbTk::ThemeProxy<FbWinFrameTheme> &m_theme; ///< theme to be used |
317 | FbTk::ImageControl &m_imagectrl; ///< Image control for rendering | 319 | FbTk::ImageControl &m_imagectrl; ///< Image control for rendering |
318 | /** | 320 | /** |
319 | @name windows | 321 | @name windows |