aboutsummaryrefslogtreecommitdiff
path: root/src/ToolbarTheme.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-08-11 16:54:46 (GMT)
committerfluxgen <fluxgen>2003-08-11 16:54:46 (GMT)
commit6016857678cc2a58bfb8af62e5474c3671d7bd38 (patch)
treeb955c6846e35da3d9caca7794151970f3fe8ce05 /src/ToolbarTheme.hh
parentf6d07eacb3165bad2b1bcd8a04700a95611fd0a0 (diff)
downloadfluxbox_pavel-6016857678cc2a58bfb8af62e5474c3671d7bd38.zip
fluxbox_pavel-6016857678cc2a58bfb8af62e5474c3671d7bd38.tar.bz2
updated for new toolbar
Diffstat (limited to 'src/ToolbarTheme.hh')
-rw-r--r--src/ToolbarTheme.hh20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/ToolbarTheme.hh b/src/ToolbarTheme.hh
index eaa7811..d356ead 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.5 2003/07/10 13:48:35 fluxgen Exp $ 22// $Id: ToolbarTheme.hh,v 1.6 2003/08/11 16:54:46 fluxgen Exp $
23 23
24#ifndef TOOLBARTHEME_HH 24#ifndef TOOLBARTHEME_HH
25#define TOOLBARTHEME_HH 25#define TOOLBARTHEME_HH
@@ -54,6 +54,8 @@ public:
54 */ 54 */
55 ///@{ 55 ///@{
56 const FbTk::Texture &toolbar() const { return *m_toolbar; } 56 const FbTk::Texture &toolbar() const { return *m_toolbar; }
57 const FbTk::Texture &iconbarFocused() const { return *m_iconbar_focused; }
58 const FbTk::Texture &iconbarUnfocused() const { return *m_iconbar_unfocused; }
57 const FbTk::Texture &label() const { return *m_label; } 59 const FbTk::Texture &label() const { return *m_label; }
58 const FbTk::Texture &window() const { return *m_window; } 60 const FbTk::Texture &window() const { return *m_window; }
59 const FbTk::Texture &button() const { return *m_button; } 61 const FbTk::Texture &button() const { return *m_button; }
@@ -62,6 +64,8 @@ public:
62 ///@} 64 ///@}
63 const FbTk::Font &font() const { return *m_font; } 65 const FbTk::Font &font() const { return *m_font; }
64 FbTk::Font &font() { return *m_font; } 66 FbTk::Font &font() { return *m_font; }
67 const FbTk::Font &iconFont() const { return *m_icon_font; }
68 FbTk::Font &iconFont() { return *m_icon_font; }
65 /** 69 /**
66 @name graphic context 70 @name graphic context
67 */ 71 */
@@ -70,6 +74,8 @@ public:
70 GC windowTextGC() const { return m_window_text_gc; } 74 GC windowTextGC() const { return m_window_text_gc; }
71 GC clockTextGC() const { return m_clock_text_gc; } 75 GC clockTextGC() const { return m_clock_text_gc; }
72 GC buttonPicGC() const { return m_button_pic_gc; } 76 GC buttonPicGC() const { return m_button_pic_gc; }
77 GC iconTextFocusedGC() const { return m_icon_text_focused_gc; }
78 GC iconTextUnfocusedGC() const { return m_icon_text_unfocused_gc; }
73 ///@} 79 ///@}
74 FbTk::Justify justify() const { return *m_justify; } 80 FbTk::Justify justify() const { return *m_justify; }
75 81
@@ -77,27 +83,27 @@ public:
77 inline int bevelWidth() const { return *m_bevel_width; } 83 inline int bevelWidth() const { return *m_bevel_width; }
78 inline int buttonBorderWidth() const { return *m_button_border_width; } 84 inline int buttonBorderWidth() const { return *m_button_border_width; }
79 inline bool shape() const { return *m_shape; } 85 inline bool shape() const { return *m_shape; }
80 86 inline unsigned char alpha() const { return *m_alpha; }
81 void addListener(FbTk::Observer &obs) { m_theme_change_sig.attach(&obs); }
82 void removeListener(FbTk::Observer &obs) { m_theme_change_sig.detach(&obs); }
83 87
84private: 88private:
85 // text colors 89 // text colors
86 FbTk::ThemeItem<FbTk::Color> m_label_textcolor, m_window_textcolor, m_clock_textcolor; 90 FbTk::ThemeItem<FbTk::Color> m_label_textcolor, m_window_textcolor, m_clock_textcolor;
87 FbTk::ThemeItem<FbTk::Color> m_button_color, m_border_color; 91 FbTk::ThemeItem<FbTk::Color> m_button_color, m_border_color;
88 // textures 92 // textures
89 FbTk::ThemeItem<FbTk::Texture> m_toolbar, m_label, m_window, m_button, m_pressed_button, m_clock; 93 FbTk::ThemeItem<FbTk::Texture> m_toolbar, m_iconbar_focused, m_iconbar_unfocused,
90 FbTk::ThemeItem<FbTk::Font> m_font; 94 m_label, m_window, m_button, m_pressed_button, m_clock;
95 FbTk::ThemeItem<FbTk::Font> m_font, m_icon_font;
91 FbTk::ThemeItem<FbTk::Justify> m_justify; 96 FbTk::ThemeItem<FbTk::Justify> m_justify;
92 97
93 FbTk::ThemeItem<int> m_border_width, m_bevel_width, m_button_border_width; 98 FbTk::ThemeItem<int> m_border_width, m_bevel_width, m_button_border_width;
94 FbTk::ThemeItem<bool> m_shape; 99 FbTk::ThemeItem<bool> m_shape;
100 FbTk::ThemeItem<int> m_alpha;
95 101
96 // graphic context 102 // graphic context
97 GC m_label_text_gc, m_window_text_gc, m_clock_text_gc, m_button_pic_gc; 103 GC m_label_text_gc, m_window_text_gc, m_clock_text_gc, m_button_pic_gc;
104 GC m_icon_text_unfocused_gc, m_icon_text_focused_gc;
98 Display *m_display; 105 Display *m_display;
99 106
100 FbTk::Subject m_theme_change_sig;
101}; 107};
102 108
103#endif // TOOLBARTHEME_HH 109#endif // TOOLBARTHEME_HH