nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use the widget's bevel width

Browse source
This commit is contained in:
Dana Jansens 2003-02-05 07:37:48 +00:00
parent 69d12b5ee2
commit 871e777e55
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
otk/focuslabel.cc
View file

@ -37,7 +37,7 @@ void FocusLabel::fitString(const std::string &str)
void FocusLabel::fitSize(int w, int h) void FocusLabel::fitSize(int w, int h)
{ {
unsigned int sidemargin = style()->bevelWidth() * 2; unsigned int sidemargin = _bevel_width * 2;
resize(w + sidemargin * 2, h); resize(w + sidemargin * 2, h);
} }
@ -46,7 +46,7 @@ void FocusLabel::update()
if (_dirty) { if (_dirty) {
int w = _rect.width(), h = _rect.height(); int w = _rect.width(), h = _rect.height();
const Font *ft = style()->labelFont(); const Font *ft = style()->labelFont();
unsigned int sidemargin = style()->bevelWidth() * 2; unsigned int sidemargin = _bevel_width * 2;
if (!_fixed_width) if (!_fixed_width)
w = ft->measureString(_text) + sidemargin * 2; w = ft->measureString(_text) + sidemargin * 2;
if (!_fixed_height) if (!_fixed_height)
@ -72,7 +72,7 @@ void FocusLabel::renderForeground()
const Font *ft = style()->labelFont(); const Font *ft = style()->labelFont();
RenderColor *text_color = (isFocused() ? style()->textFocusColor() RenderColor *text_color = (isFocused() ? style()->textFocusColor()
: style()->textUnfocusColor()); : style()->textUnfocusColor());
unsigned int sidemargin = style()->bevelWidth() * 2; unsigned int sidemargin = _bevel_width * 2;
ustring t = _text; // the actual text to draw ustring t = _text; // the actual text to draw
int x = sidemargin; // x coord for the text int x = sidemargin; // x coord for the text

6
otk/label.cc
View file

@ -33,7 +33,7 @@ void Label::fitString(const std::string &str)
void Label::fitSize(int w, int h) void Label::fitSize(int w, int h)
{ {
unsigned int sidemargin = style()->bevelWidth() * 2; unsigned int sidemargin = _bevel_width * 2;
resize(w + sidemargin * 2, h); resize(w + sidemargin * 2, h);
} }
@ -42,7 +42,7 @@ void Label::update()
if (_dirty) { if (_dirty) {
int w = _rect.width(), h = _rect.height(); int w = _rect.width(), h = _rect.height();
const Font *ft = style()->labelFont(); const Font *ft = style()->labelFont();
unsigned int sidemargin = style()->bevelWidth() * 2; unsigned int sidemargin = _bevel_width * 2;
if (!_fixed_width) if (!_fixed_width)
w = ft->measureString(_text) + sidemargin * 2; w = ft->measureString(_text) + sidemargin * 2;
if (!_fixed_height) if (!_fixed_height)
@ -66,7 +66,7 @@ void Label::renderForeground(void)
Widget::renderForeground(); Widget::renderForeground();
const Font *ft = style()->labelFont(); 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 ustring t = _text; // the actual text to draw
int x = sidemargin; // x coord for the text int x = sidemargin; // x coord for the text