From e64d90be4d5b86a497ed8f03c6ba40512765e239 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Thu, 23 Jan 2003 01:44:01 +0000 Subject: [PATCH] new render system in effect. now ot make it look right --- otk/font.cc | 12 ++++++------ otk/font.hh | 6 +++--- otk/renderstyle.cc | 4 ++++ src/buttonwidget.cc | 2 ++ src/frame.cc | 2 +- src/labelwidget.cc | 2 ++ 6 files changed, 18 insertions(+), 10 deletions(-) diff --git a/otk/font.cc b/otk/font.cc index 21b9bfb0..4fc09fcf 100644 --- a/otk/font.cc +++ b/otk/font.cc @@ -82,7 +82,7 @@ Font::~Font(void) } -unsigned int Font::measureString(const ustring &string) const +int Font::measureString(const ustring &string) const { XGlyphInfo info; @@ -93,19 +93,19 @@ unsigned int Font::measureString(const ustring &string) const XftTextExtents8(**display, _xftfont, (FcChar8*)string.c_str(), string.bytes(), &info); - return info.xOff + (_shadow ? _offset : 0); + return (signed) info.xOff + (_shadow ? _offset : 0); } -unsigned int Font::height(void) const +int Font::height(void) const { - return _xftfont->height + (_shadow ? _offset : 0); + return (signed) _xftfont->height + (_shadow ? _offset : 0); } -unsigned int Font::maxCharWidth(void) const +int Font::maxCharWidth(void) const { - return _xftfont->max_advance_width; + return (signed) _xftfont->max_advance_width; } } diff --git a/otk/font.hh b/otk/font.hh index afc36dea..16c47f27 100644 --- a/otk/font.hh +++ b/otk/font.hh @@ -57,10 +57,10 @@ public: inline const std::string &fontstring() const { return _fontstring; } - unsigned int height() const; - unsigned int maxCharWidth() const; + int height() const; + int maxCharWidth() const; - unsigned int measureString(const ustring &string) const; + int measureString(const ustring &string) const; // The RenderControl classes use the internal data to render the fonts, but // noone else needs it, so its private. diff --git a/otk/renderstyle.cc b/otk/renderstyle.cc index c1d5685e..7e8b6446 100644 --- a/otk/renderstyle.cc +++ b/otk/renderstyle.cc @@ -168,6 +168,7 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile) 0x0); _label_font = new Font(_screen, "Arial,Sans-9:bold", true, 1, 0x40); + _label_justify = RightJustify; _max_mask = new PixmapMask(); _max_mask->w = _max_mask->h = 8; @@ -208,6 +209,9 @@ RenderStyle::RenderStyle(int screen, const std::string &stylefile) display->screenInfo(_screen)->rootWindow(), data, 8, 8); } + + _bevel_width = 1; + _handle_width = 4; } RenderStyle::~RenderStyle() diff --git a/src/buttonwidget.cc b/src/buttonwidget.cc index 4c1bd908..53a7ffd5 100644 --- a/src/buttonwidget.cc +++ b/src/buttonwidget.cc @@ -80,6 +80,7 @@ void ButtonWidget::setStyle(otk::RenderStyle *style) void ButtonWidget::update() { printf("ButtonWidget::update()\n"); + otk::Widget::update(); } void ButtonWidget::renderForeground() @@ -88,6 +89,7 @@ void ButtonWidget::renderForeground() int width; bool draw = _dirty; + printf("ButtonWidget::renderForeground()\n"); otk::Widget::renderForeground(); if (draw) { diff --git a/src/frame.cc b/src/frame.cc index e186e898..cd73f29a 100644 --- a/src/frame.cc +++ b/src/frame.cc @@ -153,7 +153,7 @@ void Frame::adjustSize() _titlebar.setGeometry(-bwidth, -bwidth, width, - _style->labelFont()->height() + bevel * 2); + _style->labelFont()->height() + (bevel * 2)); _innersize.top += _titlebar.height() + bwidth; // set the label size diff --git a/src/labelwidget.cc b/src/labelwidget.cc index e45a8835..becb62ed 100644 --- a/src/labelwidget.cc +++ b/src/labelwidget.cc @@ -70,6 +70,7 @@ void LabelWidget::unfocus() void LabelWidget::update() { printf("LabelWidget::update()\n"); + otk::Widget::update(); } @@ -77,6 +78,7 @@ void LabelWidget::renderForeground() { bool draw = _dirty; + printf("LabelWidget::renderForeground()\n"); otk::Widget::renderForeground(); if (draw) { -- 2.45.2