aboutsummaryrefslogtreecommitdiff
path: root/src/FbWinFrameTheme.hh
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.hh
parent41b5c6dadb1f474675660cef18b812d4c2338ed2 (diff)
downloadfluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.zip
fluxbox_pavel-a59428d67a95a9df16554962f0a6257d6378328a.tar.bz2
merged changes from pre-devel
Diffstat (limited to 'src/FbWinFrameTheme.hh')
-rw-r--r--src/FbWinFrameTheme.hh19
1 files changed, 5 insertions, 14 deletions
diff --git a/src/FbWinFrameTheme.hh b/src/FbWinFrameTheme.hh
index 319e01b..04d6ee4 100644
--- a/src/FbWinFrameTheme.hh
+++ b/src/FbWinFrameTheme.hh
@@ -33,6 +33,7 @@
33#include "FbTk/GContext.hh" 33#include "FbTk/GContext.hh"
34 34
35#include "BorderTheme.hh" 35#include "BorderTheme.hh"
36#include "IconbarTheme.hh"
36#include "Shape.hh" 37#include "Shape.hh"
37 38
38class FbWinFrameTheme: public FbTk::Theme { 39class FbWinFrameTheme: public FbTk::Theme {
@@ -43,9 +44,6 @@ public:
43 @name textures 44 @name textures
44 */ 45 */
45 //@{ 46 //@{
46 const FbTk::Texture &labelFocusTexture() const { return *m_label_focus; }
47 const FbTk::Texture &labelUnfocusTexture() const { return *m_label_unfocus; }
48 const FbTk::ThemeItem<FbTk::Texture> &label() const { return m_label_unfocus; }
49 const FbTk::Texture &titleFocusTexture() const { return *m_title_focus; } 47 const FbTk::Texture &titleFocusTexture() const { return *m_title_focus; }
50 const FbTk::Texture &titleUnfocusTexture() const { return *m_title_unfocus; } 48 const FbTk::Texture &titleUnfocusTexture() const { return *m_title_unfocus; }
51 49
@@ -64,18 +62,11 @@ public:
64 @name colors 62 @name colors
65 */ 63 */
66 //@{ 64 //@{
67 const FbTk::Color &labelFocusColor() const { return *m_label_focus_color; }
68 const FbTk::Color &labelUnfocusColor() const { return *m_label_unfocus_color; }
69
70 const FbTk::Color &buttonFocuscolor() const { return *m_button_focus_color; } 65 const FbTk::Color &buttonFocuscolor() const { return *m_button_focus_color; }
71 const FbTk::Color &buttonUnfocuscolor() const { return *m_button_unfocus_color; } 66 const FbTk::Color &buttonUnfocuscolor() const { return *m_button_unfocus_color; }
72 //@} 67 //@}
73 FbTk::Font &font() { return *m_font; } 68 FbTk::Font &font() { return *m_font; }
74 69
75 FbTk::Justify justify() const { return *m_textjustify; }
76
77 GC labelTextFocusGC() const { return m_label_text_focus_gc.gc(); }
78 GC labelTextUnfocusGC() const { return m_label_text_unfocus_gc.gc(); }
79 GC buttonPicFocusGC() const { return m_button_pic_focus_gc.gc(); } 70 GC buttonPicFocusGC() const { return m_button_pic_focus_gc.gc(); }
80 GC buttonPicUnfocusGC() const { return m_button_pic_unfocus_gc.gc(); } 71 GC buttonPicUnfocusGC() const { return m_button_pic_unfocus_gc.gc(); }
81 72
@@ -100,24 +91,22 @@ public:
100 void setFocusedAlpha(unsigned char alpha) { m_focused_alpha = alpha; } 91 void setFocusedAlpha(unsigned char alpha) { m_focused_alpha = alpha; }
101 void setUnfocusedAlpha(unsigned char alpha) { m_unfocused_alpha = alpha; } 92 void setUnfocusedAlpha(unsigned char alpha) { m_unfocused_alpha = alpha; }
102 93
94 IconbarTheme &iconbarTheme() { return m_iconbar_theme; }
95
103private: 96private:
104 FbTk::ThemeItem<FbTk::Texture> m_label_focus, m_label_unfocus;
105 FbTk::ThemeItem<FbTk::Texture> m_title_focus, m_title_unfocus; 97 FbTk::ThemeItem<FbTk::Texture> m_title_focus, m_title_unfocus;
106 FbTk::ThemeItem<FbTk::Texture> m_handle_focus, m_handle_unfocus; 98 FbTk::ThemeItem<FbTk::Texture> m_handle_focus, m_handle_unfocus;
107 FbTk::ThemeItem<FbTk::Texture> m_button_focus, m_button_unfocus, m_button_pressed; 99 FbTk::ThemeItem<FbTk::Texture> m_button_focus, m_button_unfocus, m_button_pressed;
108 FbTk::ThemeItem<FbTk::Texture> m_grip_focus, m_grip_unfocus; 100 FbTk::ThemeItem<FbTk::Texture> m_grip_focus, m_grip_unfocus;
109 101
110 FbTk::ThemeItem<FbTk::Color> m_label_focus_color, m_label_unfocus_color;
111 FbTk::ThemeItem<FbTk::Color> m_button_focus_color, m_button_unfocus_color; 102 FbTk::ThemeItem<FbTk::Color> m_button_focus_color, m_button_unfocus_color;
112 103
113 FbTk::ThemeItem<FbTk::Font> m_font; 104 FbTk::ThemeItem<FbTk::Font> m_font;
114 FbTk::ThemeItem<FbTk::Justify> m_textjustify;
115 FbTk::ThemeItem<Shape::ShapePlace> m_shape_place; 105 FbTk::ThemeItem<Shape::ShapePlace> m_shape_place;
116 106
117 FbTk::ThemeItem<int> m_title_height, m_bevel_width, m_handle_width; 107 FbTk::ThemeItem<int> m_title_height, m_bevel_width, m_handle_width;
118 BorderTheme m_border; 108 BorderTheme m_border;
119 109
120 FbTk::GContext m_label_text_focus_gc, m_label_text_unfocus_gc;
121 FbTk::GContext m_button_pic_focus_gc, m_button_pic_unfocus_gc; 110 FbTk::GContext m_button_pic_focus_gc, m_button_pic_unfocus_gc;
122 111
123 Cursor m_cursor_move; 112 Cursor m_cursor_move;
@@ -127,6 +116,8 @@ private:
127 Cursor m_cursor_upper_right_angle; 116 Cursor m_cursor_upper_right_angle;
128 unsigned char m_focused_alpha; 117 unsigned char m_focused_alpha;
129 unsigned char m_unfocused_alpha; 118 unsigned char m_unfocused_alpha;
119
120 IconbarTheme m_iconbar_theme;
130}; 121};
131 122
132#endif // FBWINFRAMETHEME_HH 123#endif // FBWINFRAMETHEME_HH