aboutsummaryrefslogtreecommitdiff
path: root/src/Theme.hh
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2002-07-23 17:11:59 (GMT)
committerfluxgen <fluxgen>2002-07-23 17:11:59 (GMT)
commit35c55cdc8dc0771a07c2276d3190782b89d8a715 (patch)
tree4d0ccaaaf6165453bfe46af0bcc20ed82846041b /src/Theme.hh
parent8b560ddf76a0b0256a1c2ffd0cb97d91153e8192 (diff)
downloadfluxbox_pavel-35c55cdc8dc0771a07c2276d3190782b89d8a715.zip
fluxbox_pavel-35c55cdc8dc0771a07c2276d3190782b89d8a715.tar.bz2
moved Texture and Color into new files, fixed some const and pointers
Diffstat (limited to 'src/Theme.hh')
-rw-r--r--src/Theme.hh28
1 files changed, 14 insertions, 14 deletions
diff --git a/src/Theme.hh b/src/Theme.hh
index 66f44bf..b892647 100644
--- a/src/Theme.hh
+++ b/src/Theme.hh
@@ -42,7 +42,7 @@
42// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 42// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
43// DEALINGS IN THE SOFTWARE. 43// DEALINGS IN THE SOFTWARE.
44 44
45// $Id: Theme.hh,v 1.10 2002/07/19 21:44:06 fluxgen Exp $ 45// $Id: Theme.hh,v 1.11 2002/07/23 17:11:59 fluxgen Exp $
46 46
47#ifndef THEME_HH 47#ifndef THEME_HH
48#define THEME_HH 48#define THEME_HH
@@ -68,8 +68,8 @@ public:
68 typedef struct MenuStyle { 68 typedef struct MenuStyle {
69 MenuStyle(Display *display):titlefont(display, "fixed"), 69 MenuStyle(Display *display):titlefont(display, "fixed"),
70 framefont(display, "fixed") { } 70 framefont(display, "fixed") { }
71 BColor t_text, f_text, h_text, d_text; 71 FbTk::Color t_text, f_text, h_text, d_text;
72 BTexture title, frame, hilite; 72 FbTk::Texture title, frame, hilite;
73 GC t_text_gc, f_text_gc, h_text_gc, d_text_gc, hilite_gc; 73 GC t_text_gc, f_text_gc, h_text_gc, d_text_gc, hilite_gc;
74 FbTk::Font titlefont, framefont; 74 FbTk::Font titlefont, framefont;
75 DrawUtil::Font::FontJustify framefont_justify; 75 DrawUtil::Font::FontJustify framefont_justify;
@@ -79,23 +79,23 @@ public:
79 79
80 typedef struct LabelStyle 80 typedef struct LabelStyle
81 { 81 {
82 BTexture l_focus, l_unfocus, 82 FbTk::Texture l_focus, l_unfocus,
83 t_focus, t_unfocus; 83 t_focus, t_unfocus;
84 GC l_text_focus_gc, l_text_unfocus_gc; 84 GC l_text_focus_gc, l_text_unfocus_gc;
85 DrawUtil::Font font; 85 DrawUtil::Font font;
86 BColor l_text_focus, l_text_unfocus; 86 FbTk::Color l_text_focus, l_text_unfocus;
87 } LabelStyle; 87 } LabelStyle;
88 88
89 89
90 typedef struct WindowStyle:public LabelStyle { 90 typedef struct WindowStyle:public LabelStyle {
91 BColor f_focus, f_unfocus, b_pic_focus, 91 FbTk::Color f_focus, f_unfocus, b_pic_focus,
92 b_pic_unfocus; 92 b_pic_unfocus;
93 BTexture h_focus, h_unfocus, 93 FbTk::Texture h_focus, h_unfocus,
94 b_focus, b_unfocus, b_pressed, g_focus, g_unfocus; 94 b_focus, b_unfocus, b_pressed, g_focus, g_unfocus;
95 GC b_pic_focus_gc, b_pic_unfocus_gc; 95 GC b_pic_focus_gc, b_pic_unfocus_gc;
96 96
97 struct t_tab:public LabelStyle { 97 struct t_tab:public LabelStyle {
98 BColor border_color; 98 FbTk::Color border_color;
99 unsigned int border_width; 99 unsigned int border_width;
100 unsigned int border_width_2x; 100 unsigned int border_width_2x;
101 DrawUtil::XRotFontStruct *rot_font; 101 DrawUtil::XRotFontStruct *rot_font;
@@ -105,8 +105,8 @@ public:
105 105
106 106
107 typedef struct ToolbarStyle { 107 typedef struct ToolbarStyle {
108 BColor l_text, w_text, c_text, b_pic; 108 FbTk::Color l_text, w_text, c_text, b_pic;
109 BTexture toolbar, label, window, button, pressed, clock; 109 FbTk::Texture toolbar, label, window, button, pressed, clock;
110 GC l_text_gc, w_text_gc, c_text_gc, b_pic_gc; 110 GC l_text_gc, w_text_gc, c_text_gc, b_pic_gc;
111 DrawUtil::Font font; 111 DrawUtil::Font font;
112 112
@@ -120,7 +120,7 @@ public:
120 inline unsigned int getHandleWidth(void) const { return m_handle_width; } 120 inline unsigned int getHandleWidth(void) const { return m_handle_width; }
121 inline unsigned int getFrameWidth(void) const { return m_frame_width; } 121 inline unsigned int getFrameWidth(void) const { return m_frame_width; }
122 inline const GC &getOpGC(void) const { return m_opgc; } 122 inline const GC &getOpGC(void) const { return m_opgc; }
123 inline const BColor &getBorderColor(void) const { return m_border_color; } 123 inline const FbTk::Color &getBorderColor(void) const { return m_border_color; }
124 void load(const char *filename); 124 void load(const char *filename);
125 void reconfigure(); 125 void reconfigure();
126 126
@@ -141,8 +141,8 @@ private:
141 void freeTabStyle(); 141 void freeTabStyle();
142 void freeToolbarStyle(); 142 void freeToolbarStyle();
143 143
144 bool readDatabaseTexture(char *, char *, BTexture *, unsigned long); 144 bool readDatabaseTexture(char *, char *, FbTk::Texture *, unsigned long);
145 bool readDatabaseColor(char *, char *, BColor *, unsigned long); 145 bool readDatabaseColor(char *, char *, FbTk::Color *, unsigned long);
146 146
147 void readDatabaseFontSet(char *, char *, XFontSet *); 147 void readDatabaseFontSet(char *, char *, XFontSet *);
148 XFontSet createFontSet(char *); 148 XFontSet createFontSet(char *);
@@ -156,7 +156,7 @@ private:
156 MenuStyle m_menustyle; 156 MenuStyle m_menustyle;
157 ToolbarStyle m_toolbarstyle; 157 ToolbarStyle m_toolbarstyle;
158 unsigned int m_bevel_width, m_border_width, m_handle_width, m_frame_width; 158 unsigned int m_bevel_width, m_border_width, m_handle_width, m_frame_width;
159 BColor m_border_color; 159 FbTk::Color m_border_color;
160 GC m_opgc; 160 GC m_opgc;
161 BImageControl *m_imagecontrol; 161 BImageControl *m_imagecontrol;
162 Display *m_display; 162 Display *m_display;