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 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: Toolbar.cc,v 1.98 2003/07/10 11:48:14 fluxgen Exp $
+// $Id: Toolbar.cc,v 1.99 2003/07/10 13:46:47 fluxgen Exp $
 
 #include "Toolbar.hh"
 
@@ -548,6 +548,11 @@ void Toolbar::reconfigure() {
     else if (frame.workspace_label_w > frame.clock_w)
         frame.clock_w = frame.workspace_label_w;
 
+    frame.psbutton.window().setBorderWidth(theme().buttonBorderWidth());
+    frame.nsbutton.window().setBorderWidth(theme().buttonBorderWidth());
+    frame.pwbutton.window().setBorderWidth(theme().buttonBorderWidth());
+    frame.nwbutton.window().setBorderWidth(theme().buttonBorderWidth());
+
     // Right, let's break this one down....
     // full width, minus clock, workspace label and the 4 arrow buttons.
     // 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 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolbarTheme.cc,v 1.4 2003/07/10 12:00:09 fluxgen Exp $
+// $Id: ToolbarTheme.cc,v 1.5 2003/07/10 13:48:35 fluxgen Exp $
 
 #include "ToolbarTheme.hh"
 
@@ -67,7 +67,8 @@ ToolbarTheme::ToolbarTheme(int screen_num):
     m_justify(*this, "toolbar.justify", "Toolbar.Justify"),
     m_border_width(*this, "toolbar.borderWidth", "Toolbar.BorderWidth"),
     m_bevel_width(*this, "toolbar.bevelWidth", "Toolbar.BevelWidth"),
-    m_shape(*this, "toolbar.shape", "Toolbar.Shape"),
+    m_button_border_width(*this, "toolbar.button.borderWidth", "Toolbar.Button.BorderWidth"),
+    m_shape(*this, "toolbar.shaped", "Toolbar.Shaped"),    
     m_display(FbTk::App::instance()->display()) {
 
     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 @@
 // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 // DEALINGS IN THE SOFTWARE.
 
-// $Id: ToolbarTheme.hh,v 1.4 2003/07/10 12:00:09 fluxgen Exp $
+// $Id: ToolbarTheme.hh,v 1.5 2003/07/10 13:48:35 fluxgen Exp $
 
 #ifndef TOOLBARTHEME_HH
 #define TOOLBARTHEME_HH
@@ -75,6 +75,7 @@ public:
 
     inline int borderWidth() const { return *m_border_width; }
     inline int bevelWidth() const { return *m_bevel_width; }    
+    inline int buttonBorderWidth() const { return *m_button_border_width; }
     inline bool shape() const { return *m_shape; }
 
     void addListener(FbTk::Observer &obs) { m_theme_change_sig.attach(&obs); }
@@ -89,7 +90,7 @@ private:
     FbTk::ThemeItem<FbTk::Font> m_font;
     FbTk::ThemeItem<FbTk::Justify> m_justify;
 
-    FbTk::ThemeItem<int> m_border_width, m_bevel_width;
+    FbTk::ThemeItem<int> m_border_width, m_bevel_width, m_button_border_width;
     FbTk::ThemeItem<bool> m_shape;
 
     // graphic context