X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=otk%2Fwidget.cc;h=9cc822aea8683ff98b41fdd606d8eca6d194ccbf;hb=2b2f81b93c89c2a2d6abc3b12dee66b8e2a0452d;hp=07122bc645a2b9237dbd0f0b9d8d8e5dd06ccbcd;hpb=06de24ec6666578759eff2b348e50f5e8e20f3bd;p=chaz%2Fopenbox diff --git a/otk/widget.cc b/otk/widget.cc index 07122bc6..9cc822ae 100644 --- a/otk/widget.cc +++ b/otk/widget.cc @@ -187,12 +187,6 @@ void OtkWidget::hide(bool recursive) void OtkWidget::focus(void) { -/* if (! _visible) - return; - - XSetInputFocus(otk::OBDisplay::display, _window, RevertToPointerRoot, - CurrentTime);*/ - _focused = true; OtkWidget::OtkWidgetList::iterator it = _children.begin(), @@ -253,7 +247,9 @@ void OtkWidget::ungrabKeyboard(void) void OtkWidget::render(void) { if (!_texture) return; - + + printf("rendering %lx\n", _texture); + _bg_pixmap = _texture->render(_rect.width(), _rect.height(), _bg_pixmap); if (_bg_pixmap) @@ -392,7 +388,7 @@ void OtkWidget::adjustVert(void) void OtkWidget::update(void) { if (_dirty) { - if (! _unmanaged) + printf("widget dirty, redrawing\n"); adjust(); render(); XClearWindow(OBDisplay::display, _window); @@ -445,15 +441,6 @@ void OtkWidget::setStyle(Style *style) _style = style; _dirty = true; - // reset textures/colors - if (_focused) { - unfocus(); - focus(); - } else { - focus(); - unfocus(); - } - OtkWidgetList::iterator it, end = _children.end(); for (it = _children.begin(); it != end; ++it) (*it)->setStyle(style);