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/WinButtonTheme.cc | |
parent | 60ba709c2f47cc2c7b877aef1b0f297b097853e5 (diff) | |
download | fluxbox_pavel-ac1bd7e0981222bf340ce7defb2bb8307d42a0a2.zip fluxbox_pavel-ac1bd7e0981222bf340ce7defb2bb8307d42a0a2.tar.bz2 |
update code to use ThemeProxy
Diffstat (limited to 'src/WinButtonTheme.cc')
-rw-r--r-- | src/WinButtonTheme.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/WinButtonTheme.cc b/src/WinButtonTheme.cc index b724817..d58af35 100644 --- a/src/WinButtonTheme.cc +++ b/src/WinButtonTheme.cc | |||
@@ -27,7 +27,8 @@ | |||
27 | 27 | ||
28 | #include "FbWinFrameTheme.hh" | 28 | #include "FbWinFrameTheme.hh" |
29 | 29 | ||
30 | WinButtonTheme::WinButtonTheme(int screen_num, FbWinFrameTheme &frame_theme): | 30 | WinButtonTheme::WinButtonTheme(int screen_num, |
31 | FbTk::ThemeProxy<FbWinFrameTheme> &frame_theme): | ||
31 | FbTk::Theme(screen_num), | 32 | FbTk::Theme(screen_num), |
32 | m_close_pm(*this, "window.close.pixmap", "Window.Close.Pixmap"), | 33 | m_close_pm(*this, "window.close.pixmap", "Window.Close.Pixmap"), |
33 | m_close_unfocus_pm(*this, "window.close.unfocus.pixmap", "Window.Close.Unfocus.Pixmap"), | 34 | m_close_unfocus_pm(*this, "window.close.unfocus.pixmap", "Window.Close.Unfocus.Pixmap"), |
@@ -66,11 +67,11 @@ WinButtonTheme::~WinButtonTheme() { | |||
66 | void WinButtonTheme::reconfigTheme() { | 67 | void WinButtonTheme::reconfigTheme() { |
67 | // rescale the pixmaps to match frame theme height | 68 | // rescale the pixmaps to match frame theme height |
68 | 69 | ||
69 | unsigned int size = m_frame_theme.titleHeight() | 70 | unsigned int size = m_frame_theme->titleHeight() |
70 | - 2 * m_frame_theme.bevelWidth(); | 71 | - 2 * m_frame_theme->bevelWidth(); |
71 | if (m_frame_theme.titleHeight() == 0) { | 72 | if (m_frame_theme->titleHeight() == 0) { |
72 | // calculate height from font and border width to scale pixmaps | 73 | // calculate height from font and border width to scale pixmaps |
73 | size = m_frame_theme.font().height() + 2; | 74 | size = m_frame_theme->font().height() + 2; |
74 | 75 | ||
75 | } // else use specified height to scale pixmaps | 76 | } // else use specified height to scale pixmaps |
76 | 77 | ||