dont show a handle if it cant be resized at all

[chaz/openbox] / otk / widget.cc

diff --git a/otk/widget.cc b/otk/widget.cc
index 154fc92cd6faa698a1fcbde220634873a4981581..ca8c527aaa3a8abfe7dc91fcef98252c1a2fa1e6 100644 (file)
--- 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()
@@ -259,15 +257,12 @@ void Widget::ungrabKeyboard(void)
 void Widget::render(void)
 {
   if (!_texture) return;
-  printf("RENDER\n");
 
   Surface *s = _surface; // save the current surface
   
   _surface = new Surface(_screen, _rect.size());
   display->renderControl(_screen)->drawBackground(*_surface, *_texture);
 
-  if (dynamic_cast<FocusLabel*>(this))
-    printf("IM A FOCUSLABEL RENDERING\n");
   renderForeground(); // for inherited types to render onto the _surface
 
   XSetWindowBackgroundPixmap(**display, _window, _surface->pixmap());
@@ -329,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);
@@ -386,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);