Mercurial > hg > toolkit / file diff

--- a/ui/qt/container.cpp	Mon Jan 12 12:03:05 2015 +0100
+++ b/ui/qt/container.cpp	Wed Jan 21 16:02:30 2015 +0100
@@ -35,6 +35,8 @@
 /* -------------------- UiBoxContainer -------------------- */
 
 UiBoxContainer::UiBoxContainer(QBoxLayout* box) {
+    this->current = NULL;
+    this->menu = NULL;
     this->box = box;
     box->setContentsMargins(QMargins(0,0,0,0));
     box->setSpacing(0);
@@ -65,6 +67,7 @@
         hasStretchedWidget = true;
     }
     ui_reset_layout(layout);
+    current = widget;
 }
 
 UIWIDGET ui_box(UiObject *obj, QBoxLayout::Direction dir) {
@@ -94,6 +97,8 @@
 /* -------------------- UiGridContainer -------------------- */
 
 UiGridContainer::UiGridContainer(QGridLayout* grid) {
+    this->current = NULL;
+    this->menu = NULL;
     this->grid = grid;
     grid->setContentsMargins(QMargins(0,0,0,0));
     grid->setSpacing(0);
@@ -120,12 +125,15 @@
     x++;
     
     ui_reset_layout(layout);
+    current = widget;
 }
 
 
 /* -------------------- UiTabViewContainer -------------------- */
 
 UiTabViewContainer::UiTabViewContainer(QTabWidget* tabwidget) {
+    this->current = NULL;
+    this->menu = NULL;
     this->tabwidget = tabwidget;
 }
 
@@ -140,6 +148,7 @@
 
 void UiStackContainer::add(QWidget* widget, bool fill) {
     stack->addWidget(widget);
+    current = widget;
 }
 
 UIWIDGET ui_tabview(UiObject *obj) {