all repos — openbox @ 871e777e55fa76938da991b9b1a72605ba78bad4

openbox fork - make it a bit more like ryudo 

use the widget's bevel width
Dana Jansens danakj@orodu.net
commit

871e777e55fa76938da991b9b1a72605ba78bad4

parent

69d12b5ee2e8da238ac2fca5606cc25ddaa07523

2 files changed, 6 insertions(+), 6 deletions(-)

jump to
M otk/focuslabel.cc → otk/focuslabel.cc 
@@ -37,7 +37,7 @@ }
 
 void FocusLabel::fitSize(int w, int h)
 {
-  unsigned int sidemargin = style()->bevelWidth() * 2;
+  unsigned int sidemargin = _bevel_width * 2;
   resize(w + sidemargin * 2, h);
 }
 

@@ -46,7 +46,7 @@ {
   if (_dirty) {
     int w = _rect.width(), h = _rect.height();
     const Font *ft = style()->labelFont();
-    unsigned int sidemargin = style()->bevelWidth() * 2;
+    unsigned int sidemargin = _bevel_width * 2;
     if (!_fixed_width)
       w = ft->measureString(_text) + sidemargin * 2;
     if (!_fixed_height)

@@ -72,7 +72,7 @@ 
   const Font *ft = style()->labelFont();
   RenderColor *text_color = (isFocused() ? style()->textFocusColor()
                              : style()->textUnfocusColor());
-  unsigned int sidemargin = style()->bevelWidth() * 2;
+  unsigned int sidemargin = _bevel_width * 2;
 
   ustring t = _text; // the actual text to draw
   int x = sidemargin;    // x coord for the text
M otk/label.cc → otk/label.cc 
@@ -33,7 +33,7 @@ }
 
 void Label::fitSize(int w, int h)
 {
-  unsigned int sidemargin = style()->bevelWidth() * 2;
+  unsigned int sidemargin = _bevel_width * 2;
   resize(w + sidemargin * 2, h);
 }
 

@@ -42,7 +42,7 @@ {
   if (_dirty) {
     int w = _rect.width(), h = _rect.height();
     const Font *ft = style()->labelFont();
-    unsigned int sidemargin = style()->bevelWidth() * 2;
+    unsigned int sidemargin = _bevel_width * 2;
     if (!_fixed_width)
       w = ft->measureString(_text) + sidemargin * 2;
     if (!_fixed_height)

@@ -66,7 +66,7 @@ {
   Widget::renderForeground();
 
   const Font *ft = style()->labelFont();
-  unsigned int sidemargin = style()->bevelWidth() * 2;
+  unsigned int sidemargin = _bevel_width * 2;
 
   ustring t = _text; // the actual text to draw
   int x = sidemargin;    // x coord for the text