aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-07-10 13:48:35 (GMT)
committerfluxgen <fluxgen>2003-07-10 13:48:35 (GMT)
commitaf1d8d9a8a033b4dcc44aff67f00e959ed5dfe4f (patch)
treec1ede67ad422901f2ceee2bdd216921116f23dc9
parenta3c69f66110df1d2c254a363dcb68c370284519b (diff)
downloadfluxbox_pavel-af1d8d9a8a033b4dcc44aff67f00e959ed5dfe4f.zip
fluxbox_pavel-af1d8d9a8a033b4dcc44aff67f00e959ed5dfe4f.tar.bz2
added border width for buttons
-rw-r--r--src/Toolbar.cc7
-rw-r--r--src/ToolbarTheme.cc5
-rw-r--r--src/ToolbarTheme.hh5
3 files changed, 12 insertions, 5 deletions
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index 24df816..19d7a4d 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: Toolbar.cc,v 1.98 2003/07/10 11:48:14 fluxgen Exp $ 25// $Id: Toolbar.cc,v 1.99 2003/07/10 13:46:47 fluxgen Exp $
26 26
27#include "Toolbar.hh" 27#include "Toolbar.hh"
28 28
@@ -548,6 +548,11 @@ void Toolbar::reconfigure() {
548 else if (frame.workspace_label_w > frame.clock_w) 548 else if (frame.workspace_label_w > frame.clock_w)
549 frame.clock_w = frame.workspace_label_w; 549 frame.clock_w = frame.workspace_label_w;
550 550
551 frame.psbutton.window().setBorderWidth(theme().buttonBorderWidth());
552 frame.nsbutton.window().setBorderWidth(theme().buttonBorderWidth());
553 frame.pwbutton.window().setBorderWidth(theme().buttonBorderWidth());
554 frame.nwbutton.window().setBorderWidth(theme().buttonBorderWidth());
555
551 // Right, let's break this one down.... 556 // Right, let's break this one down....
552 // full width, minus clock, workspace label and the 4 arrow buttons. 557 // full width, minus clock, workspace label and the 4 arrow buttons.
553 // each of the (6) aforementioned items are separated by a bevel width, 558 // each of the (6) aforementioned items are separated by a bevel width,
diff --git a/src/ToolbarTheme.cc b/src/ToolbarTheme.cc
index 2797c1e..28a80a4 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.4 2003/07/10 12:00:09 fluxgen Exp $ 22// $Id: ToolbarTheme.cc,v 1.5 2003/07/10 13:48:35 fluxgen Exp $
23 23
24#include "ToolbarTheme.hh" 24#include "ToolbarTheme.hh"
25 25
@@ -67,7 +67,8 @@ ToolbarTheme::ToolbarTheme(int screen_num):
67 m_justify(*this, "toolbar.justify", "Toolbar.Justify"), 67 m_justify(*this, "toolbar.justify", "Toolbar.Justify"),
68 m_border_width(*this, "toolbar.borderWidth", "Toolbar.BorderWidth"), 68 m_border_width(*this, "toolbar.borderWidth", "Toolbar.BorderWidth"),
69 m_bevel_width(*this, "toolbar.bevelWidth", "Toolbar.BevelWidth"), 69 m_bevel_width(*this, "toolbar.bevelWidth", "Toolbar.BevelWidth"),
70 m_shape(*this, "toolbar.shape", "Toolbar.Shape"), 70 m_button_border_width(*this, "toolbar.button.borderWidth", "Toolbar.Button.BorderWidth"),
71 m_shape(*this, "toolbar.shaped", "Toolbar.Shaped"),
71 m_display(FbTk::App::instance()->display()) { 72 m_display(FbTk::App::instance()->display()) {
72 73
73 Window rootwindow = RootWindow(m_display, screen_num); 74 Window rootwindow = RootWindow(m_display, screen_num);
diff --git a/src/ToolbarTheme.hh b/src/ToolbarTheme.hh
index 770967f..eaa7811 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.4 2003/07/10 12:00:09 fluxgen Exp $ 22// $Id: ToolbarTheme.hh,v 1.5 2003/07/10 13:48:35 fluxgen Exp $
23 23
24#ifndef TOOLBARTHEME_HH 24#ifndef TOOLBARTHEME_HH
25#define TOOLBARTHEME_HH 25#define TOOLBARTHEME_HH
@@ -75,6 +75,7 @@ public:
75 75
76 inline int borderWidth() const { return *m_border_width; } 76 inline int borderWidth() const { return *m_border_width; }
77 inline int bevelWidth() const { return *m_bevel_width; } 77 inline int bevelWidth() const { return *m_bevel_width; }
78 inline int buttonBorderWidth() const { return *m_button_border_width; }
78 inline bool shape() const { return *m_shape; } 79 inline bool shape() const { return *m_shape; }
79 80
80 void addListener(FbTk::Observer &obs) { m_theme_change_sig.attach(&obs); } 81 void addListener(FbTk::Observer &obs) { m_theme_change_sig.attach(&obs); }
@@ -89,7 +90,7 @@ private:
89 FbTk::ThemeItem<FbTk::Font> m_font; 90 FbTk::ThemeItem<FbTk::Font> m_font;
90 FbTk::ThemeItem<FbTk::Justify> m_justify; 91 FbTk::ThemeItem<FbTk::Justify> m_justify;
91 92
92 FbTk::ThemeItem<int> m_border_width, m_bevel_width; 93 FbTk::ThemeItem<int> m_border_width, m_bevel_width, m_button_border_width;
93 FbTk::ThemeItem<bool> m_shape; 94 FbTk::ThemeItem<bool> m_shape;
94 95
95 // graphic context 96 // graphic context