aboutsummaryrefslogtreecommitdiff
path: root/src/FbWinFrameTheme.cc
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/FbWinFrameTheme.cc
parentdbfddf8e0bcf8e7abbba671eff64c9679332a774 (diff)
downloadfluxbox-ec3125aeb95a06f08cd4895c5b7c3a8911c1b368.zip
fluxbox-ec3125aeb95a06f08cd4895c5b7c3a8911c1b368.tar.bz2
switch FbWinFrameTheme to use FocusableTheme
Diffstat (limited to 'src/FbWinFrameTheme.cc')
-rw-r--r--src/FbWinFrameTheme.cc46
1 files changed, 15 insertions, 31 deletions
diff --git a/src/FbWinFrameTheme.cc b/src/FbWinFrameTheme.cc
index 634a0fd..5431532 100644
--- a/src/FbWinFrameTheme.cc
+++ b/src/FbWinFrameTheme.cc
@@ -26,39 +26,26 @@
26 26
27#include <X11/cursorfont.h> 27#include <X11/cursorfont.h>
28 28
29FbWinFrameTheme::FbWinFrameTheme(int screen_num): 29FbWinFrameTheme::FbWinFrameTheme(int screen_num, const std::string &extra,
30 const std::string &altextra):
30 FbTk::Theme(screen_num), 31 FbTk::Theme(screen_num),
31 m_title_focus(*this, "window.title.focus", "Window.Title.Focus"), 32 m_title(*this, "window.title" + extra, "Window.Title" + altextra),
32 m_title_unfocus(*this, "window.title.unfocus", "Window.Title.Unfocus"), 33 m_handle(*this, "window.handle" + extra, "Window.Handle" + altextra),
33 34 m_button(*this, "window.button" + extra, "Window.Button" + altextra),
34 m_handle_focus(*this, "window.handle.focus", "Window.Handle.Focus"),
35 m_handle_unfocus(*this, "window.handle.unfocus", "Window.Handle.Unfocus"),
36
37 m_button_focus(*this, "window.button.focus", "Window.Button.Focus"),
38 m_button_unfocus(*this, "window.button.unfocus", "Window.Button.Unfocus"),
39 m_button_pressed(*this, "window.button.pressed", "Window.Button.Pressed"), 35 m_button_pressed(*this, "window.button.pressed", "Window.Button.Pressed"),
40 36 m_grip(*this, "window.grip" + extra, "Window.Grip" + altextra),
41 m_grip_focus(*this, "window.grip.focus", "Window.Grip.Focus"), 37 m_button_color(*this, "window.button" + extra + ".picColor",
42 m_grip_unfocus(*this, "window.grip.unfocus", "Window.Grip.Unfocus"), 38 "Window.Button" + altextra + ".PicColor"),
43
44 m_button_focus_color(*this, "window.button.focus.picColor", "Window.Button.Focus.PicColor"),
45 m_button_unfocus_color(*this, "window.button.unfocus.picColor", "Window.Button.Unfocus.PicColor"),
46
47 m_font(*this, "window.font", "Window.Font"), 39 m_font(*this, "window.font", "Window.Font"),
48 m_shape_place(*this, "window.roundCorners", "Window.RoundCorners"), 40 m_shape_place(*this, "window.roundCorners", "Window.RoundCorners"),
49 m_title_height(*this, "window.title.height", "Window.Title.Height"), 41 m_title_height(*this, "window.title.height", "Window.Title.Height"),
50 m_bevel_width(*this, "window.bevelWidth", "Window.BevelWidth"), 42 m_bevel_width(*this, "window.bevelWidth", "Window.BevelWidth"),
51 m_handle_width(*this, "window.handleWidth", "Window.handleWidth"), 43 m_handle_width(*this, "window.handleWidth", "Window.handleWidth"),
52 m_border_focus(*this, "window.focus", "Window.Focus"), 44 m_border(*this, "window" + extra, "Window" + altextra),
53 m_border_unfocus(*this, "window.unfocus", "Window.Unfocus"), 45 m_button_pic_gc(RootWindow(FbTk::App::instance()->display(), screen_num)),
54 m_button_pic_focus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)), 46 m_alpha(255),
55 m_button_pic_unfocus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)), 47 m_iconbar_theme(screen_num, "window.label" + extra,
56 m_focused_alpha(255), 48 "Window.Label" + altextra) {
57 m_unfocused_alpha(255),
58 m_focused_iconbar_theme(screen_num, "window.label.focus",
59 "Window.Label.Unfocus"),
60 m_unfocused_iconbar_theme(screen_num, "window.label.unfocus",
61 "Window.Label.Unfocus") {
62 49
63 *m_title_height = 0; 50 *m_title_height = 0;
64 // set defaults 51 // set defaults
@@ -111,10 +98,7 @@ void FbWinFrameTheme::reconfigTheme() {
111 else if (*m_handle_width < 0) 98 else if (*m_handle_width < 0)
112 *m_handle_width = 1; 99 *m_handle_width = 1;
113 100
114 m_button_pic_focus_gc.setForeground(*m_button_focus_color); 101 m_button_pic_gc.setForeground(*m_button_color);
115 m_button_pic_unfocus_gc.setForeground(*m_button_unfocus_color); 102 m_iconbar_theme.reconfigTheme();
116
117 m_focused_iconbar_theme.reconfigTheme();
118 m_unfocused_iconbar_theme.reconfigTheme();
119} 103}
120 104