M src/Toolbar.cc → src/Toolbar.cc

@@ -22,7 +22,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // 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"
 
@@ -547,6 +547,11 @@ if (frame.workspace_label_w < frame.clock_w)
         frame.workspace_label_w = frame.clock_w;
     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.

M src/ToolbarTheme.cc → src/ToolbarTheme.cc

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // 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 @@ m_font(*this, "toolbar.font", "Toolbar.Font"),
     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);

M src/ToolbarTheme.hh → src/ToolbarTheme.hh

@@ -19,7 +19,7 @@ // LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 // 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 @@ FbTk::Justify justify() const { return *m_justify; }
 
     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 @@ FbTk::ThemeItem<FbTk::Texture> m_toolbar, m_label, m_window, m_button, m_pressed_button, m_clock;
     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