Changeset 20757 in vbox

Timestamp:

Jun 22, 2009 10:02:23 AM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4: 3948: Mini-ToolBar for Full-screen & Seamless modes: Fixed bug when toolbar geometry was not updated if snapshot is taken (e.g. toolbar's label changed).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxMiniToolBar.h (modified) (1 diff)
• src/VBoxMiniToolBar.cpp (modified) (3 diffs)

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

@@ -79 +79 @@
 private:
 
+    void initialize();
     void recreateMask();
     void moveToBase();

trunk/src/VBox/Frontends/VirtualBox/src/VBoxMiniToolBar.cpp

@@ -133 +133 @@
 void VBoxMiniToolBar::setDisplayText (const QString &aText)
 {
-    mDisplayLabel->setText (aText);
+    if (mDisplayLabel->text() != aText)
+    {
+        /* Update toolbar label */
+        mDisplayLabel->setText (aText);
+
+        /* Reinitialize */
+        initialize();
+
+        if (!isHidden())
+            updateDisplay (!mAutoHide, false);
+    }
 }
 
@@ -287 +297 @@
             lableMargin->setMinimumWidth (15);
 
-        /* Resize to sizehint */
-        resize (sizeHint());
-
         /* Initialize */
-        recreateMask();
-        moveToBase();
+        initialize();
 
         mPolished = true;
@@ -311 +317 @@
     mAutoHide = !aOn;
     updateDisplay (!mAutoHide, false);
+}
+
+void VBoxMiniToolBar::initialize()
+{
+    /* Resize to sizehint */
+    resize (sizeHint());
+
+    /* Update geometry */
+    recreateMask();
+    moveToBase();
 }