1 files changed, 27 insertions, 7 deletions
diff --git a/client/widgets/widget.cc b/client/widgets/widget.cc
index ac90ef2..a57eb78 100644
--- a/client/widgets/widget.cc
+++ b/client/widgets/widget.cc
@@ -313,8 +313,26 @@ bool Widget::hidden()
 
 bool Widget::setKeyboardFocus()
 {
-  widget->setFocus();
-  return true;
+  if((widget->focusPolicy() & Qt::TabFocus) != 0) {
+    widget->setFocus();
+    return true;
+  }
+
+  return false;
+}
+
+bool Widget::setKeyboardFocusRecursive()
+{
+  if(setKeyboardFocus()) return true;
+
+  QVector< Widget* >::iterator i = children.begin();
+  while(i != children.end()) {
+    Widget *w = *i;
+    if(w && w->setKeyboardFocusRecursive()) return true;
+    i++;
+  }
+
+  return false;
 }
 
 Widget *Widget::findWidget(QString n, bool deep)
@@ -514,11 +532,13 @@ void Widget::createWidget(QDomNode &xml_node, QLayout *layout)
 
   }
 
-  addChild(widget);
-
-  if(layout) layout->addWidget(widget->qwidget());
-
-  if(widget && widget->qwidget()) widget->qwidget()->show();
+  if(widget) {
+    addChild(widget);
+    if(widget->qwidget()) {
+      if(layout) layout->addWidget(widget->qwidget());
+      widget->qwidget()->show();
+    }
+  }
 }
 
 int wdg_name(lua_State *L)