aboutsummaryrefslogtreecommitdiff
path: root/src/FbWinFrameTheme.cc
diff options
context:
space:
mode:
authormarkt <markt>2007-10-13 21:51:37 (GMT)
committermarkt <markt>2007-10-13 21:51:37 (GMT)
commita59428d67a95a9df16554962f0a6257d6378328a (patch)
treef856ed9300c34f7a17d499f22d895610cfbc08e5 /src/FbWinFrameTheme.cc
parent41b5c6dadb1f474675660cef18b812d4c2338ed2 (diff)
downloadfluxbox-a59428d67a95a9df16554962f0a6257d6378328a.zip
fluxbox-a59428d67a95a9df16554962f0a6257d6378328a.tar.bz2
merged changes from pre-devel
Diffstat (limited to 'src/FbWinFrameTheme.cc')
-rw-r--r--src/FbWinFrameTheme.cc18
1 files changed, 6 insertions, 12 deletions
diff --git a/src/FbWinFrameTheme.cc b/src/FbWinFrameTheme.cc
index e4bc196..6f7f9ef 100644
--- a/src/FbWinFrameTheme.cc
+++ b/src/FbWinFrameTheme.cc
@@ -24,13 +24,12 @@
24#include "FbWinFrameTheme.hh" 24#include "FbWinFrameTheme.hh"
25#include "App.hh" 25#include "App.hh"
26 26
27#include "IconbarTheme.hh"
28
27#include <X11/cursorfont.h> 29#include <X11/cursorfont.h>
28 30
29FbWinFrameTheme::FbWinFrameTheme(int screen_num): 31FbWinFrameTheme::FbWinFrameTheme(int screen_num):
30 FbTk::Theme(screen_num), 32 FbTk::Theme(screen_num),
31 m_label_focus(*this, "window.label.focus", "Window.Label.Focus"),
32 m_label_unfocus(*this, "window.label.unfocus", "Window.Label.Unfocus"),
33
34 m_title_focus(*this, "window.title.focus", "Window.Title.Focus"), 33 m_title_focus(*this, "window.title.focus", "Window.Title.Focus"),
35 m_title_unfocus(*this, "window.title.unfocus", "Window.Title.Unfocus"), 34 m_title_unfocus(*this, "window.title.unfocus", "Window.Title.Unfocus"),
36 35
@@ -44,25 +43,20 @@ FbWinFrameTheme::FbWinFrameTheme(int screen_num):
44 m_grip_focus(*this, "window.grip.focus", "Window.Grip.Focus"), 43 m_grip_focus(*this, "window.grip.focus", "Window.Grip.Focus"),
45 m_grip_unfocus(*this, "window.grip.unfocus", "Window.Grip.Unfocus"), 44 m_grip_unfocus(*this, "window.grip.unfocus", "Window.Grip.Unfocus"),
46 45
47 m_label_focus_color(*this, "window.label.focus.textColor", "Window.Label.Focus.TextColor"),
48 m_label_unfocus_color(*this, "window.label.unfocus.textColor", "Window.Label.Unfocus.TextColor"),
49
50 m_button_focus_color(*this, "window.button.focus.picColor", "Window.Button.Focus.PicColor"), 46 m_button_focus_color(*this, "window.button.focus.picColor", "Window.Button.Focus.PicColor"),
51 m_button_unfocus_color(*this, "window.button.unfocus.picColor", "Window.Button.Unfocus.PicColor"), 47 m_button_unfocus_color(*this, "window.button.unfocus.picColor", "Window.Button.Unfocus.PicColor"),
52 48
53 m_font(*this, "window.font", "Window.Font"), 49 m_font(*this, "window.font", "Window.Font"),
54 m_textjustify(*this, "window.justify", "Window.Justify"),
55 m_shape_place(*this, "window.roundCorners", "Window.RoundCorners"), 50 m_shape_place(*this, "window.roundCorners", "Window.RoundCorners"),
56 m_title_height(*this, "window.title.height", "Window.Title.Height"), 51 m_title_height(*this, "window.title.height", "Window.Title.Height"),
57 m_bevel_width(*this, "window.bevelWidth", "Window.BevelWidth"), 52 m_bevel_width(*this, "window.bevelWidth", "Window.BevelWidth"),
58 m_handle_width(*this, "window.handleWidth", "Window.handleWidth"), 53 m_handle_width(*this, "window.handleWidth", "Window.handleWidth"),
59 m_border(*this, "window", "Window"), // for window.border* 54 m_border(*this, "window", "Window"), // for window.border*
60 m_label_text_focus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)),
61 m_label_text_unfocus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)),
62 m_button_pic_focus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)), 55 m_button_pic_focus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)),
63 m_button_pic_unfocus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)), 56 m_button_pic_unfocus_gc(RootWindow(FbTk::App::instance()->display(), screen_num)),
64 m_focused_alpha(255), 57 m_focused_alpha(255),
65 m_unfocused_alpha(255) { 58 m_unfocused_alpha(255),
59 m_iconbar_theme(screen_num, "window.label", "Window.Label") {
66 60
67 *m_title_height = 0; 61 *m_title_height = 0;
68 // set defaults 62 // set defaults
@@ -107,9 +101,9 @@ void FbWinFrameTheme::reconfigTheme() {
107 else if (*m_handle_width < 0) 101 else if (*m_handle_width < 0)
108 *m_handle_width = 1; 102 *m_handle_width = 1;
109 103
110 m_label_text_focus_gc.setForeground(*m_label_focus_color);
111 m_label_text_unfocus_gc.setForeground(*m_label_unfocus_color);
112 m_button_pic_focus_gc.setForeground(*m_button_focus_color); 104 m_button_pic_focus_gc.setForeground(*m_button_focus_color);
113 m_button_pic_unfocus_gc.setForeground(*m_button_unfocus_color); 105 m_button_pic_unfocus_gc.setForeground(*m_button_unfocus_color);
106
107 m_iconbar_theme.reconfigTheme();
114} 108}
115 109