diff options
| author | Dana Jansens <danakj@orodu.net> | 2003-02-05 07:37:48 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2003-02-05 07:37:48 +0000 |
| commit | 871e777e55fa76938da991b9b1a72605ba78bad4 (patch) | |
| tree | b24aee27cb7e729beaca93fe52beed0366ebc4bc | |
| parent | 69d12b5ee2e8da238ac2fca5606cc25ddaa07523 (diff) | |
use the widget's bevel width
| -rw-r--r-- | otk/focuslabel.cc | 6 | ||||
| -rw-r--r-- | otk/label.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/otk/focuslabel.cc b/otk/focuslabel.cc index bd74aa94..f45ee71d 100644 --- a/otk/focuslabel.cc +++ b/otk/focuslabel.cc @@ -37,7 +37,7 @@ void FocusLabel::fitString(const std::string &str) 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 @@ void FocusLabel::update() 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 @@ void FocusLabel::renderForeground() 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 diff --git a/otk/label.cc b/otk/label.cc index f0a4b665..824cc81d 100644 --- a/otk/label.cc +++ b/otk/label.cc @@ -33,7 +33,7 @@ void Label::fitString(const std::string &str) 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 @@ void Label::update() 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 @@ void Label::renderForeground(void) 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 |