no space on teh top or bottom of text..

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

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