linear focus cycling

[chaz/openbox] / otk / widget.cc

diff --git a/otk/widget.cc b/otk/widget.cc
index 036ed1c3d5c4f16f8e4991643915f1abcb4356cb..69a86237ec407cdccf8ceb412a12204c7e54d61a 100644 (file)
--- a/otk/widget.cc
+++ b/otk/widget.cc
@@ -8,7 +8,7 @@
 #include "display.hh"
 #include "assassin.hh"
 #include "screeninfo.hh"
-
+#include "focuslabel.hh"
 #include <algorithm>
 #include <iostream>
 
@@ -175,7 +175,7 @@ void Widget::show(bool recursive)
   if (recursive) {
     WidgetList::iterator it = _children.begin(), end = _children.end();
     for (; it != end; ++it)
-      (*it)->show();
+      (*it)->show(recursive);
   }
 
   XMapWindow(**display, _window);
@@ -259,14 +259,13 @@ 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);
 
-  renderForeground();
+  renderForeground(); // for inherited types to render onto the _surface
 
   XSetWindowBackgroundPixmap(**display, _window, _surface->pixmap());