aboutsummaryrefslogtreecommitdiff
path: root/src/ToolbarTheme.hh
diff options
context:
space:
mode:
Diffstat (limited to 'src/ToolbarTheme.hh')
-rw-r--r--src/ToolbarTheme.hh31
1 files changed, 5 insertions, 26 deletions
diff --git a/src/ToolbarTheme.hh b/src/ToolbarTheme.hh
index d356ead..4076732 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.6 2003/08/11 16:54:46 fluxgen Exp $ 22// $Id: ToolbarTheme.hh,v 1.7 2003/08/13 09:53:35 fluxgen Exp $
23 23
24#ifndef TOOLBARTHEME_HH 24#ifndef TOOLBARTHEME_HH
25#define TOOLBARTHEME_HH 25#define TOOLBARTHEME_HH
@@ -43,9 +43,6 @@ public:
43 @name colors 43 @name colors
44 */ 44 */
45 ///@{ 45 ///@{
46 const FbTk::Color &labelTextColor() const { return *m_label_textcolor; }
47 const FbTk::Color &windowTextColor() const { return *m_window_textcolor; }
48 const FbTk::Color &clockTextColor() const { return *m_clock_textcolor; }
49 const FbTk::Color &buttonColor() const { return *m_button_color; } 46 const FbTk::Color &buttonColor() const { return *m_button_color; }
50 const FbTk::Color &borderColor() const { return *m_border_color; } 47 const FbTk::Color &borderColor() const { return *m_border_color; }
51 ///@} 48 ///@}
@@ -54,30 +51,16 @@ public:
54 */ 51 */
55 ///@{ 52 ///@{
56 const FbTk::Texture &toolbar() const { return *m_toolbar; } 53 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; }
59 const FbTk::Texture &label() const { return *m_label; }
60 const FbTk::Texture &window() const { return *m_window; }
61 const FbTk::Texture &button() const { return *m_button; } 54 const FbTk::Texture &button() const { return *m_button; }
62 const FbTk::Texture &pressedButton() const { return *m_pressed_button; } 55 const FbTk::Texture &pressedButton() const { return *m_pressed_button; }
63 const FbTk::Texture &clock() const { return *m_clock; }
64 ///@} 56 ///@}
65 const FbTk::Font &font() const { return *m_font; } 57
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; }
69 /** 58 /**
70 @name graphic context 59 @name graphic context
71 */ 60 */
72 ///@{ 61 ///@{
73 GC labelTextGC() const { return m_label_text_gc; }
74 GC windowTextGC() const { return m_window_text_gc; }
75 GC clockTextGC() const { return m_clock_text_gc; }
76 GC buttonPicGC() const { return m_button_pic_gc; } 62 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; }
79 ///@} 63 ///@}
80 FbTk::Justify justify() const { return *m_justify; }
81 64
82 inline int borderWidth() const { return *m_border_width; } 65 inline int borderWidth() const { return *m_border_width; }
83 inline int bevelWidth() const { return *m_bevel_width; } 66 inline int bevelWidth() const { return *m_bevel_width; }
@@ -87,21 +70,17 @@ public:
87 70
88private: 71private:
89 // text colors 72 // text colors
90 FbTk::ThemeItem<FbTk::Color> m_label_textcolor, m_window_textcolor, m_clock_textcolor;
91 FbTk::ThemeItem<FbTk::Color> m_button_color, m_border_color; 73 FbTk::ThemeItem<FbTk::Color> m_button_color, m_border_color;
92 // textures 74 // textures
93 FbTk::ThemeItem<FbTk::Texture> m_toolbar, m_iconbar_focused, m_iconbar_unfocused, 75 FbTk::ThemeItem<FbTk::Texture> m_toolbar, m_button, m_pressed_button;
94 m_label, m_window, m_button, m_pressed_button, m_clock;
95 FbTk::ThemeItem<FbTk::Font> m_font, m_icon_font;
96 FbTk::ThemeItem<FbTk::Justify> m_justify;
97 76
98 FbTk::ThemeItem<int> m_border_width, m_bevel_width, m_button_border_width; 77 FbTk::ThemeItem<int> m_border_width, m_bevel_width, m_button_border_width;
99 FbTk::ThemeItem<bool> m_shape; 78 FbTk::ThemeItem<bool> m_shape;
100 FbTk::ThemeItem<int> m_alpha; 79 FbTk::ThemeItem<int> m_alpha;
101 80
102 // graphic context 81 // graphic context
103 GC m_label_text_gc, m_window_text_gc, m_clock_text_gc, m_button_pic_gc; 82 GC m_button_pic_gc;
104 GC m_icon_text_unfocused_gc, m_icon_text_focused_gc; 83
105 Display *m_display; 84 Display *m_display;
106 85
107}; 86};