summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ToolbarTheme.cc6
-rw-r--r--src/ToolbarTheme.hh9
2 files changed, 12 insertions, 3 deletions
diff --git a/src/ToolbarTheme.cc b/src/ToolbarTheme.cc
index 374a596..61df3d4 100644
--- a/src/ToolbarTheme.cc
+++ b/src/ToolbarTheme.cc
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: ToolbarTheme.cc,v 1.2 2003/02/15 01:59:00 fluxgen Exp $ 22// $Id: ToolbarTheme.cc,v 1.3 2003/06/24 16:26:56 fluxgen Exp $
23 23
24#include "ToolbarTheme.hh" 24#include "ToolbarTheme.hh"
25 25
@@ -38,6 +38,8 @@ ToolbarTheme::ToolbarTheme(int screen_num):
38 "toolbar.clock.textColor", "Toolbar.Clock.TextColor"), 38 "toolbar.clock.textColor", "Toolbar.Clock.TextColor"),
39 m_button_color(*this, 39 m_button_color(*this,
40 "toolbar.button.picColor", "Toolbar.Button.PicColor"), 40 "toolbar.button.picColor", "Toolbar.Button.PicColor"),
41 m_border_color(*this,
42 "toolbar.borderColor", "toolbar.borderColor"),
41 m_toolbar(*this, "toolbar", "Toolbar"), 43 m_toolbar(*this, "toolbar", "Toolbar"),
42 m_label(*this, "toolbar.label", "Toolbar.Label"), 44 m_label(*this, "toolbar.label", "Toolbar.Label"),
43 m_window(*this, "toolbar.windowLabel", "Toolbar.WindowLabel"), 45 m_window(*this, "toolbar.windowLabel", "Toolbar.WindowLabel"),
@@ -47,6 +49,8 @@ ToolbarTheme::ToolbarTheme(int screen_num):
47 m_clock(*this, "toolbar.clock", "Toolbar.Clock"), 49 m_clock(*this, "toolbar.clock", "Toolbar.Clock"),
48 m_font(*this, "toolbar.font", "Toolbar.Font"), 50 m_font(*this, "toolbar.font", "Toolbar.Font"),
49 m_justify(*this, "toolbar.justify", "Toolbar.Justify"), 51 m_justify(*this, "toolbar.justify", "Toolbar.Justify"),
52 m_border_width(*this, "toolbar.borderWidth", "Toolbar.BorderWidth"),
53 m_bevel_width(*this, "toolbar.bevelWidth", "Toolbar.BevelWidth"),
50 m_display(FbTk::App::instance()->display()){ 54 m_display(FbTk::App::instance()->display()){
51 55
52 Window rootwindow = RootWindow(m_display, screen_num); 56 Window rootwindow = RootWindow(m_display, screen_num);
diff --git a/src/ToolbarTheme.hh b/src/ToolbarTheme.hh
index cbe9c90..dda3346 100644
--- a/src/ToolbarTheme.hh
+++ b/src/ToolbarTheme.hh
@@ -19,7 +19,7 @@
19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 19// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
20// DEALINGS IN THE SOFTWARE. 20// DEALINGS IN THE SOFTWARE.
21 21
22// $Id: ToolbarTheme.hh,v 1.2 2003/02/15 01:58:52 fluxgen Exp $ 22// $Id: ToolbarTheme.hh,v 1.3 2003/06/24 16:26:56 fluxgen Exp $
23 23
24#ifndef TOOLBARTHEME_HH 24#ifndef TOOLBARTHEME_HH
25#define TOOLBARTHEME_HH 25#define TOOLBARTHEME_HH
@@ -47,6 +47,7 @@ public:
47 const FbTk::Color &windowTextColor() const { return *m_window_textcolor; } 47 const FbTk::Color &windowTextColor() const { return *m_window_textcolor; }
48 const FbTk::Color &clockTextColor() const { return *m_clock_textcolor; } 48 const FbTk::Color &clockTextColor() const { return *m_clock_textcolor; }
49 const FbTk::Color &buttonColor() const { return *m_button_color; } 49 const FbTk::Color &buttonColor() const { return *m_button_color; }
50 const FbTk::Color &borderColor() const { return *m_border_color; }
50 ///@} 51 ///@}
51 /** 52 /**
52 @name textures 53 @name textures
@@ -72,16 +73,20 @@ public:
72 ///@} 73 ///@}
73 FbTk::Justify justify() const { return *m_justify; } 74 FbTk::Justify justify() const { return *m_justify; }
74 75
76 int borderWidth() const { return *m_border_width; }
77 int bevelWidth() const { return *m_bevel_width; }
75 void addListener(FbTk::Observer &obs) { m_theme_change_sig.attach(&obs); } 78 void addListener(FbTk::Observer &obs) { m_theme_change_sig.attach(&obs); }
76 void removeListener(FbTk::Observer &obs) { m_theme_change_sig.detach(&obs); } 79 void removeListener(FbTk::Observer &obs) { m_theme_change_sig.detach(&obs); }
77private: 80private:
78 // text colors 81 // text colors
79 FbTk::ThemeItem<FbTk::Color> m_label_textcolor, m_window_textcolor, m_clock_textcolor; 82 FbTk::ThemeItem<FbTk::Color> m_label_textcolor, m_window_textcolor, m_clock_textcolor;
80 FbTk::ThemeItem<FbTk::Color> m_button_color; 83 FbTk::ThemeItem<FbTk::Color> m_button_color, m_border_color;
81 // textures 84 // textures
82 FbTk::ThemeItem<FbTk::Texture> m_toolbar, m_label, m_window, m_button, m_pressed_button, m_clock; 85 FbTk::ThemeItem<FbTk::Texture> m_toolbar, m_label, m_window, m_button, m_pressed_button, m_clock;
83 FbTk::ThemeItem<FbTk::Font> m_font; 86 FbTk::ThemeItem<FbTk::Font> m_font;
84 FbTk::ThemeItem<FbTk::Justify> m_justify; 87 FbTk::ThemeItem<FbTk::Justify> m_justify;
88
89 FbTk::ThemeItem<int> m_border_width, m_bevel_width;
85 // graphic context 90 // graphic context
86 GC m_label_text_gc, m_window_text_gc, m_clock_text_gc, m_button_pic_gc; 91 GC m_label_text_gc, m_window_text_gc, m_clock_text_gc, m_button_pic_gc;
87 Display *m_display; 92 Display *m_display;