X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.cc;h=ca8c527aaa3a8abfe7dc91fcef98252c1a2fa1e6;hb=44d653e3e8d042bf3f1d68108a8197a895888da8;hp=69a86237ec407cdccf8ceb412a12204c7e54d61a;hpb=ff3bb7566b76ff28e72e64054908145854b4454d;p=chaz%2Fopenbox diff --git a/otk/widget.cc b/otk/widget.cc index 69a86237..ca8c527a 100644 --- a/otk/widget.cc +++ b/otk/widget.cc @@ -32,7 +32,6 @@ Widget::Widget(Widget *parent, Direction direction) parent->addChild(this); create(); _event_dispatcher->registerHandler(_window, this); - setStyle(_style); // let the widget initialize stuff } Widget::Widget(EventDispatcher *event_dispatcher, RenderStyle *style, @@ -53,7 +52,6 @@ Widget::Widget(EventDispatcher *event_dispatcher, RenderStyle *style, assert(style); create(override_redirect); _event_dispatcher->registerHandler(_window, this); - setStyle(_style); // let the widget initialize stuff } Widget::~Widget() @@ -326,7 +324,7 @@ void Widget::adjustHorz(void) if (prev_widget) x = prev_widget->_rect.x() + prev_widget->_rect.width() + _bevel_width; else - x = _rect.x() + _bevel_width; + x = _bevel_width; y = (tallest - tmp->_rect.height()) / 2 + _bevel_width; tmp->move(x, y); @@ -383,7 +381,7 @@ void Widget::adjustVert(void) if (prev_widget) y = prev_widget->_rect.y() + prev_widget->_rect.height() + _bevel_width; else - y = _rect.y() + _bevel_width; + y = _bevel_width; x = (widest - tmp->_rect.width()) / 2 + _bevel_width; tmp->move(x, y);