aboutsummaryrefslogtreecommitdiff
path: root/src/ToolbarTheme.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/ToolbarTheme.cc')
-rw-r--r--src/ToolbarTheme.cc34
1 files changed, 5 insertions, 29 deletions
diff --git a/src/ToolbarTheme.cc b/src/ToolbarTheme.cc
index 0608726..6067264 100644
--- a/src/ToolbarTheme.cc
+++ b/src/ToolbarTheme.cc
@@ -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.cc,v 1.7 2003/08/13 09:53:46 fluxgen Exp $ 22// $Id: ToolbarTheme.cc,v 1.8 2003/08/13 15:12:39 fluxgen Exp $
23 23
24#include "ToolbarTheme.hh" 24#include "ToolbarTheme.hh"
25 25
@@ -45,36 +45,20 @@ void FbTk::ThemeItem<bool>::setFromString(char const *strval) {
45 45
46ToolbarTheme::ToolbarTheme(int screen_num): 46ToolbarTheme::ToolbarTheme(int screen_num):
47 FbTk::Theme(screen_num), 47 FbTk::Theme(screen_num),
48 m_button_color(*this,
49 "toolbar.button.picColor", "Toolbar.Button.PicColor"),
50 m_border_color(*this,
51 "toolbar.borderColor", "Toolbar.BorderColor"),
52 m_toolbar(*this, "toolbar", "Toolbar"), 48 m_toolbar(*this, "toolbar", "Toolbar"),
53 m_button(*this, "toolbar.button", "Toolbar.Button"), 49 m_border(*this, "toolbar", "Toolbar"),
54 m_pressed_button(*this,
55 "toolbar.button.pressed", "Toolbar.Button.Pressed"),
56 m_border_width(*this, "toolbar.borderWidth", "Toolbar.BorderWidth"),
57 m_bevel_width(*this, "toolbar.bevelWidth", "Toolbar.BevelWidth"), 50 m_bevel_width(*this, "toolbar.bevelWidth", "Toolbar.BevelWidth"),
58 m_button_border_width(*this, "toolbar.button.borderWidth", "Toolbar.Button.BorderWidth"),
59 m_shape(*this, "toolbar.shaped", "Toolbar.Shaped"), 51 m_shape(*this, "toolbar.shaped", "Toolbar.Shaped"),
60 m_alpha(*this, "toolbar.alpha", "Toolbar.Alpha"), 52 m_alpha(*this, "toolbar.alpha", "Toolbar.Alpha"),
61 m_display(FbTk::App::instance()->display()) { 53 m_display(FbTk::App::instance()->display()) {
62 54
63 Window rootwindow = RootWindow(m_display, screen_num); 55 *m_bevel_width = 0;
64 56 *m_alpha = 255;
65 XGCValues gcv;
66 unsigned long gc_value_mask = GCForeground;
67
68
69 gcv.foreground = m_button_color->pixel();
70 m_button_pic_gc =
71 XCreateGC(m_display, rootwindow,
72 gc_value_mask, &gcv);
73 57
74} 58}
75 59
76ToolbarTheme::~ToolbarTheme() { 60ToolbarTheme::~ToolbarTheme() {
77 XFreeGC(m_display, m_button_pic_gc); 61
78} 62}
79 63
80void ToolbarTheme::reconfigTheme() { 64void ToolbarTheme::reconfigTheme() {
@@ -82,12 +66,4 @@ void ToolbarTheme::reconfigTheme() {
82 *m_alpha = 255; 66 *m_alpha = 255;
83 else if (*m_alpha < 0) 67 else if (*m_alpha < 0)
84 *m_alpha = 0; 68 *m_alpha = 0;
85
86 XGCValues gcv;
87 unsigned long gc_value_mask = GCForeground;
88
89 gcv.foreground = m_button_color->pixel();
90 XChangeGC(m_display, m_button_pic_gc,
91 gc_value_mask, &gcv);
92
93} 69}