Changeset 29975 in vbox for trunk/src

Timestamp:

Jun 2, 2010 11:17:10 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: fix layout update problem of the toolbar on language changes (again)

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxMediaManagerDlg.cpp (modified) (1 diff)
• VBoxSelectorWnd.cpp (modified) (3 diffs)
• widgets/VBoxToolBar.h (modified) (1 diff)

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

@@ -613 +613 @@
 #endif
 #ifdef QT_MAC_USE_COCOA
-    /* There is a bug in Qt Cocoa which result in showing a "more
-     * arrow" when the necessary size of the toolbar is increased. So
-     * manually adjust the size after changing the text. */
-    mToolBar->adjustSize();
+    /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
+       the necessary size of the toolbar is increased. Also for some languages
+       the with doesn't match if the text increase. So manually adjust the size
+       after changing the text. */
+    mToolBar->updateLayout();
 #endif /* QT_MAC_USE_COCOA */
 

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

@@ -1414 +1414 @@
 
 #ifdef QT_MAC_USE_COCOA
-    /* There is a bug in Qt Cocoa which result in showing a "more
-     * arrow" when the necessary size of the toolbar is increased. So
-     * manually adjust the size after changing the text. */
-    mVMToolBar->adjustSize();
+    /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
+       the necessary size of the toolbar is increased. Also for some languages
+       the with doesn't match if the text increase. So manually adjust the size
+       after changing the text. */
+    mVMToolBar->updateLayout();
 #endif /* QT_MAC_USE_COCOA */
 }
@@ -1493 +1494 @@
             mVmStartAction->setText (tr ("S&tart"));
 #ifdef QT_MAC_USE_COCOA
-            /* There is a bug in Qt Cocoa which result in showing a "more
-             * arrow" when the necessary size of the toolbar is increased. So
-             * manually adjust the size after changing the text. */
-            mVMToolBar->adjustSize();
+            /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
+               the necessary size of the toolbar is increased. Also for some languages
+               the with doesn't match if the text increase. So manually adjust the size
+               after changing the text. */
+            mVMToolBar->updateLayout();
 #endif /* QT_MAC_USE_COCOA */
             mVmStartAction->setStatusTip (
-                tr ("Start the selected virtual machine"));
+                                          tr ("Start the selected virtual machine"));
 
             mVmStartAction->setEnabled (!running);
@@ -1507 +1509 @@
             mVmStartAction->setText (tr ("S&how"));
 #ifdef QT_MAC_USE_COCOA
-            /* There is a bug in Qt Cocoa which result in showing a "more
-             * arrow" when the necessary size of the toolbar is increased. So
-             * manually adjust the size after changing the text. */
-            mVMToolBar->adjustSize();
+            /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
+               the necessary size of the toolbar is increased. Also for some languages
+               the with doesn't match if the text increase. So manually adjust the size
+               after changing the text. */
+            mVMToolBar->updateLayout();
 #endif /* QT_MAC_USE_COCOA */
             mVmStartAction->setStatusTip (

trunk/src/VBox/Frontends/VirtualBox/src/widgets/VBoxToolBar.h

@@ -73 +73 @@
         ::darwinSetShowsToolbarButton (this, aShow);
     }
+
+    void updateLayout()
+    {
+        /* There is a bug in Qt Cocoa which result in showing a "more arrow" when
+           the necessary size of the toolbar is increased. Also for some languages
+           the with doesn't match if the text increase. So manually adjust the size
+           after changing the text. */
+        QSizePolicy sp = sizePolicy();
+        setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
+        adjustSize();
+        setSizePolicy(sp);
+        layout()->invalidate();
+        layout()->activate();
+    }
 #endif /* Q_WS_MAC */