aboutsummaryrefslogtreecommitdiff
path: root/src/FbWinFrameTheme.hh
diff options
context:
space:
mode:
authormarkt <markt>2007-04-03 17:14:00 (GMT)
committermarkt <markt>2007-04-03 17:14:00 (GMT)
commit06fb6cbd55dfabf1069d0603938e0d2d8d22581d (patch)
treed02b12518915bd23934deff497ba123a0830aa0f /src/FbWinFrameTheme.hh
parent48f761f9816f0f11e05dcc4e8f5ac506328e1683 (diff)
downloadfluxbox_pavel-06fb6cbd55dfabf1069d0603938e0d2d8d22581d.zip
fluxbox_pavel-06fb6cbd55dfabf1069d0603938e0d2d8d22581d.tar.bz2
fixed a bug, removed some unused code
Diffstat (limited to 'src/FbWinFrameTheme.hh')
-rw-r--r--src/FbWinFrameTheme.hh9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/FbWinFrameTheme.hh b/src/FbWinFrameTheme.hh
index 0feadd3..319e01b 100644
--- a/src/FbWinFrameTheme.hh
+++ b/src/FbWinFrameTheme.hh
@@ -45,7 +45,6 @@ public:
45 //@{ 45 //@{
46 const FbTk::Texture &labelFocusTexture() const { return *m_label_focus; } 46 const FbTk::Texture &labelFocusTexture() const { return *m_label_focus; }
47 const FbTk::Texture &labelUnfocusTexture() const { return *m_label_unfocus; } 47 const FbTk::Texture &labelUnfocusTexture() const { return *m_label_unfocus; }
48 const FbTk::Texture &labelActiveTexture() const { return *m_label_active; }
49 const FbTk::ThemeItem<FbTk::Texture> &label() const { return m_label_unfocus; } 48 const FbTk::ThemeItem<FbTk::Texture> &label() const { return m_label_unfocus; }
50 const FbTk::Texture &titleFocusTexture() const { return *m_title_focus; } 49 const FbTk::Texture &titleFocusTexture() const { return *m_title_focus; }
51 const FbTk::Texture &titleUnfocusTexture() const { return *m_title_unfocus; } 50 const FbTk::Texture &titleUnfocusTexture() const { return *m_title_unfocus; }
@@ -67,7 +66,6 @@ public:
67 //@{ 66 //@{
68 const FbTk::Color &labelFocusColor() const { return *m_label_focus_color; } 67 const FbTk::Color &labelFocusColor() const { return *m_label_focus_color; }
69 const FbTk::Color &labelUnfocusColor() const { return *m_label_unfocus_color; } 68 const FbTk::Color &labelUnfocusColor() const { return *m_label_unfocus_color; }
70 const FbTk::Color &labelActiveColor() const { return *m_label_active_color; }
71 69
72 const FbTk::Color &buttonFocuscolor() const { return *m_button_focus_color; } 70 const FbTk::Color &buttonFocuscolor() const { return *m_button_focus_color; }
73 const FbTk::Color &buttonUnfocuscolor() const { return *m_button_unfocus_color; } 71 const FbTk::Color &buttonUnfocuscolor() const { return *m_button_unfocus_color; }
@@ -78,7 +76,6 @@ public:
78 76
79 GC labelTextFocusGC() const { return m_label_text_focus_gc.gc(); } 77 GC labelTextFocusGC() const { return m_label_text_focus_gc.gc(); }
80 GC labelTextUnfocusGC() const { return m_label_text_unfocus_gc.gc(); } 78 GC labelTextUnfocusGC() const { return m_label_text_unfocus_gc.gc(); }
81 GC labelTextActiveGC() const { return m_label_text_active_gc.gc(); }
82 GC buttonPicFocusGC() const { return m_button_pic_focus_gc.gc(); } 79 GC buttonPicFocusGC() const { return m_button_pic_focus_gc.gc(); }
83 GC buttonPicUnfocusGC() const { return m_button_pic_unfocus_gc.gc(); } 80 GC buttonPicUnfocusGC() const { return m_button_pic_unfocus_gc.gc(); }
84 81
@@ -104,13 +101,13 @@ public:
104 void setUnfocusedAlpha(unsigned char alpha) { m_unfocused_alpha = alpha; } 101 void setUnfocusedAlpha(unsigned char alpha) { m_unfocused_alpha = alpha; }
105 102
106private: 103private:
107 FbTk::ThemeItem<FbTk::Texture> m_label_focus, m_label_unfocus, m_label_active; 104 FbTk::ThemeItem<FbTk::Texture> m_label_focus, m_label_unfocus;
108 FbTk::ThemeItem<FbTk::Texture> m_title_focus, m_title_unfocus; 105 FbTk::ThemeItem<FbTk::Texture> m_title_focus, m_title_unfocus;
109 FbTk::ThemeItem<FbTk::Texture> m_handle_focus, m_handle_unfocus; 106 FbTk::ThemeItem<FbTk::Texture> m_handle_focus, m_handle_unfocus;
110 FbTk::ThemeItem<FbTk::Texture> m_button_focus, m_button_unfocus, m_button_pressed; 107 FbTk::ThemeItem<FbTk::Texture> m_button_focus, m_button_unfocus, m_button_pressed;
111 FbTk::ThemeItem<FbTk::Texture> m_grip_focus, m_grip_unfocus; 108 FbTk::ThemeItem<FbTk::Texture> m_grip_focus, m_grip_unfocus;
112 109
113 FbTk::ThemeItem<FbTk::Color> m_label_focus_color, m_label_unfocus_color, m_label_active_color; 110 FbTk::ThemeItem<FbTk::Color> m_label_focus_color, m_label_unfocus_color;
114 FbTk::ThemeItem<FbTk::Color> m_button_focus_color, m_button_unfocus_color; 111 FbTk::ThemeItem<FbTk::Color> m_button_focus_color, m_button_unfocus_color;
115 112
116 FbTk::ThemeItem<FbTk::Font> m_font; 113 FbTk::ThemeItem<FbTk::Font> m_font;
@@ -120,7 +117,7 @@ private:
120 FbTk::ThemeItem<int> m_title_height, m_bevel_width, m_handle_width; 117 FbTk::ThemeItem<int> m_title_height, m_bevel_width, m_handle_width;
121 BorderTheme m_border; 118 BorderTheme m_border;
122 119
123 FbTk::GContext m_label_text_focus_gc, m_label_text_unfocus_gc, m_label_text_active_gc; 120 FbTk::GContext m_label_text_focus_gc, m_label_text_unfocus_gc;
124 FbTk::GContext m_button_pic_focus_gc, m_button_pic_unfocus_gc; 121 FbTk::GContext m_button_pic_focus_gc, m_button_pic_unfocus_gc;
125 122
126 Cursor m_cursor_move; 123 Cursor m_cursor_move;