labels use half the bevel width for text

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index 9eeaed17114a2b42d5c4be6e4b7c5396cb7dfb6f..50b473d89c8ad2c8d64eb7455d7decac9e7499e6 100644 (file)
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -32,13 +32,13 @@ void OtkFocusLabel::update(void)
     const BFont &ft = getStyle()->getFont();
     BColor *text_color = (isFocused() ? getStyle()->getTextFocus()
                           : getStyle()->getTextUnfocus());
-    unsigned int bevel = getStyle()->getBevelWidth();
+    unsigned int bevel = getStyle()->getBevelWidth() / 2;
 
     std::string t = _text; // the actual text to draw
     int x = bevel;         // x coord for the text
 
     // find a string that will fit inside the area for text
-    int max_length = width() - getBevelWidth() * 2;
+    int max_length = width() - bevel * 2;
     if (max_length <= 0) {
       t = ""; // can't fit anything
     } else {

diff --git a/otk/label.cc b/otk/label.cc
index 21811a2c43b20577fbfba90b06686a3a8a4b85d8..24cf84028ea0f5f31dc261dd0896bd75e79384d7 100644 (file)
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -27,13 +27,13 @@ void OtkLabel::update(void)
 {
   if (_dirty) {
     const BFont &ft = getStyle()->getFont();
-    unsigned int bevel = getStyle()->getBevelWidth();
+    unsigned int bevel = getStyle()->getBevelWidth() / 2;
 
     std::string t = _text; // the actual text to draw
     int x = bevel;         // x coord for the text
 
     // find a string that will fit inside the area for text
-    int max_length = width() - getBevelWidth() * 2;
+    int max_length = width() - bevel * 2;
     if (max_length <= 0) {
       t = ""; // can't fit anything
     } else {