aboutsummaryrefslogtreecommitdiff
path: root/src/FbWinFrame.hh
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-01-07 20:08:56 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-01-07 20:08:56 (GMT)
commitec3125aeb95a06f08cd4895c5b7c3a8911c1b368 (patch)
tree136d27f04589d0191c48b0abe940c9eb0a17a0db /src/FbWinFrame.hh
parentdbfddf8e0bcf8e7abbba671eff64c9679332a774 (diff)
downloadfluxbox_pavel-ec3125aeb95a06f08cd4895c5b7c3a8911c1b368.zip
fluxbox_pavel-ec3125aeb95a06f08cd4895c5b7c3a8911c1b368.tar.bz2
switch FbWinFrameTheme to use FocusableTheme
Diffstat (limited to 'src/FbWinFrame.hh')
-rw-r--r--src/FbWinFrame.hh8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/FbWinFrame.hh b/src/FbWinFrame.hh
index 800bc0e..6196cf3 100644
--- a/src/FbWinFrame.hh
+++ b/src/FbWinFrame.hh
@@ -40,13 +40,13 @@ class FbWinFrameTheme;
40class BScreen; 40class BScreen;
41class IconButton; 41class IconButton;
42class Focusable; 42class Focusable;
43template <class T> class FocusableTheme;
43 44
44namespace FbTk { 45namespace FbTk {
45class ImageControl; 46class ImageControl;
46class Command; 47class Command;
47class Texture; 48class Texture;
48class XLayer; 49class XLayer;
49template <class T> class ThemeProxy;
50} 50}
51 51
52/// holds a window frame with a client window 52/// holds a window frame with a client window
@@ -96,7 +96,7 @@ public:
96 }; 96 };
97 97
98 /// create a top level window 98 /// create a top level window
99 FbWinFrame(BScreen &screen, FbTk::ThemeProxy<FbWinFrameTheme> &theme, 99 FbWinFrame(BScreen &screen, FocusableTheme<FbWinFrameTheme> &theme,
100 FbTk::ImageControl &imgctrl, 100 FbTk::ImageControl &imgctrl,
101 FbTk::XLayer &layer, 101 FbTk::XLayer &layer,
102 int x, int y, 102 int x, int y,
@@ -255,7 +255,7 @@ public:
255 FbTk::FbWindow &gripRight() { return m_grip_right; } 255 FbTk::FbWindow &gripRight() { return m_grip_right; }
256 bool focused() const { return m_focused; } 256 bool focused() const { return m_focused; }
257 bool isShaded() const { return m_shaded; } 257 bool isShaded() const { return m_shaded; }
258 FbTk::ThemeProxy<FbWinFrameTheme> &theme() const { return m_theme; } 258 FocusableTheme<FbWinFrameTheme> &theme() const { return m_theme; }
259 /// @return titlebar height 259 /// @return titlebar height
260 unsigned int titlebarHeight() const { return (m_use_titlebar?m_titlebar.height()+m_window.borderWidth():0); } 260 unsigned int titlebarHeight() const { return (m_use_titlebar?m_titlebar.height()+m_window.borderWidth():0); }
261 unsigned int handleHeight() const { return (m_use_handle?m_handle.height()+m_window.borderWidth():0); } 261 unsigned int handleHeight() const { return (m_use_handle?m_handle.height()+m_window.borderWidth():0); }
@@ -314,7 +314,7 @@ private:
314 314
315 BScreen &m_screen; 315 BScreen &m_screen;
316 316
317 FbTk::ThemeProxy<FbWinFrameTheme> &m_theme; ///< theme to be used 317 FocusableTheme<FbWinFrameTheme> &m_theme; ///< theme to be used
318 FbTk::ImageControl &m_imagectrl; ///< Image control for rendering 318 FbTk::ImageControl &m_imagectrl; ///< Image control for rendering
319 /** 319 /**
320 @name windows 320 @name windows