use bevel width on the top/bottom too

diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc
index f45ee71d7718a61a02be94cb04ad05dc9259e10e..846d035ebb78de0317161796e1009535b505db32 100644 (file)
--- a/otk/focuslabel.cc
+++ b/otk/focuslabel.cc
@@ -38,7 +38,7 @@ void FocusLabel::fitString(const std::string &str)
 void FocusLabel::fitSize(int w, int h)
 {
   unsigned int sidemargin = _bevel_width * 2;
-  resize(w + sidemargin * 2, h);
+  resize(w + sidemargin * 2, h + _bevel_width * 2);
 }
 
 void FocusLabel::update()
@@ -104,7 +104,7 @@ void FocusLabel::renderForeground()
   }
 
   display->renderControl(_screen)->
-    drawString(*_surface, *ft, x, 0, *text_color, t);
+    drawString(*_surface, *ft, x, _bevel_width, *text_color, t);
 }
 
 }

diff --git a/otk/label.cc b/otk/label.cc
index 824cc81d938cf9aca6b2b6f35132d52163c61249..16bfd5f47cf9cf49d323b2cac2ee6d4a0d655497 100644 (file)
--- a/otk/label.cc
+++ b/otk/label.cc
@@ -34,7 +34,7 @@ void Label::fitString(const std::string &str)
 void Label::fitSize(int w, int h)
 {
   unsigned int sidemargin = _bevel_width * 2;
-  resize(w + sidemargin * 2, h);
+  resize(w + sidemargin * 2, h + _bevel_width * 2);
 }
 
 void Label::update()
@@ -98,7 +98,7 @@ void Label::renderForeground(void)
   }
 
   display->renderControl(_screen)->
-    drawString(*_surface, *ft, x, 0, *style()->textUnfocusColor(), t);
+    drawString(*_surface, *ft, x, _bevel_width, *style()->textUnfocusColor(), t);
 }
 
 }