Changeset 2592 in vbox

Timestamp:

May 11, 2007 12:31:38 PM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

21090

Message:

1764: Better default size in "Create VDI" wizard when called from "Create VM" wizard:

Fixing QILabel: layout reactivation upon every parent's child show event.
Used in NewVM & NewHD Wizards to ensure all widget stack's pages have required initial height.

File:

• trunk/src/VBox/Frontends/VirtualBox/include/VBoxUtils.h (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxUtils.h

@@ -29 +29 @@
 #include <qtextedit.h>
 #include <qlabel.h>
+#include <qlayout.h>
 
 /**
@@ -206 +207 @@
 
     QILabel (QWidget *aParent, const char *aName)
-         : QLabel (aParent, aName), mSizeHint (-1, -1)
+         : QLabel (aParent, aName), mShowed (false)
     {
         /* setup default size policy and alignment */
@@ -215 +216 @@
         setAlignment (int (QLabel::WordBreak | QLabel::AlignTop));
         /* install show-parent-widget watcher */
-        aParent->installEventFilter (this);
+        aParent->topLevelWidget()->installEventFilter (this);
     }
 
     QSize sizeHint() const
     {
-        /* use cashed sizeHint if mSizeHint is valid */
-        if (!mSizeHint.isValid())
-            mSizeHint = QLabel::sizeHint();
-        return mSizeHint;
+        return mShowed ?
+            QSize (width(), heightForWidth (width())) : QLabel::sizeHint();
     }
 
@@ -234 +233 @@
             case QEvent::Show:
             {
-                /* watch for parent's show-event to recalculate sizeHint */
-                mSizeHint = QSize (width(), heightForWidth (width()));
-                updateGeometry();
+                mShowed = true;
+                if (parent() && ((QWidget*)parent())->layout())
+                    ((QWidget*)parent())->layout()->activate();
                 break;
             }
@@ -245 +244 @@
     }
 
-    mutable QSize mSizeHint;
+    bool mShowed;
 };