Changeset 102269 in vbox for trunk

Timestamp:

Nov 22, 2023 6:50:08 PM (15 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10450: macOS: No need to QIToolBar layout/paint hacks since Qt6.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• cloud/consolemanager/UICloudConsoleManager.cpp (modified) (1 diff)
• cloud/profilemanager/UICloudProfileManager.cpp (modified) (1 diff)
• extensionpackmanager/UIExtensionPackManager.cpp (modified) (1 diff)
• extensions/QIToolBar.cpp (modified) (1 diff)
• extensions/QIToolBar.h (modified) (1 diff)
• helpbrowser/UIHelpBrowserWidget.cpp (modified) (1 diff)
• logviewer/UIVMLogViewerWidget.cpp (modified) (1 diff)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (2 diffs)
• medium/UIMediumManager.cpp (modified) (1 diff)
• networkmanager/UINetworkManager.cpp (modified) (1 diff)
• snapshots/UISnapshotPane.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/cloud/consolemanager/UICloudConsoleManager.cpp

@@ -489 +489 @@
 void UICloudConsoleManagerWidget::retranslateUi()
 {
-    /* Adjust toolbar: */
-#ifdef VBOX_WS_MAC
-    // WORKAROUND:
-    // 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.
-    if (m_pToolBar)
-        m_pToolBar->updateLayout();
-#endif
-
     /* Translate tree-widget: */
     m_pTreeWidget->setHeaderLabels(   QStringList()

trunk/src/VBox/Frontends/VirtualBox/src/cloud/profilemanager/UICloudProfileManager.cpp

@@ -200 +200 @@
 void UICloudProfileManagerWidget::retranslateUi()
 {
-    /* Adjust toolbar: */
-#ifdef VBOX_WS_MAC
-    // WORKAROUND:
-    // 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.
-    if (m_pToolBar)
-        m_pToolBar->updateLayout();
-#endif
-
     /* Translate tree-widget: */
     m_pTreeWidget->setHeaderLabels(   QStringList()

trunk/src/VBox/Frontends/VirtualBox/src/extensionpackmanager/UIExtensionPackManager.cpp

@@ -199 +199 @@
 void UIExtensionPackManagerWidget::retranslateUi()
 {
-    /* Adjust toolbar: */
-#ifdef VBOX_WS_MAC
-    // WORKAROUND:
-    // 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.
-    if (m_pToolBar)
-        m_pToolBar->updateLayout();
-#endif
-
     /* Translate tree-widget: */
     m_pTreeWidget->setHeaderLabels(   QStringList()

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIToolBar.cpp

@@ -93 +93 @@
 {
     ::darwinSetShowsToolbarButton(this, fShow);
-}
-
-void QIToolBar::updateLayout()
-{
-    // WORKAROUND:
-    // There is a bug in Qt Cocoa which result in showing a "more arrow" when
-    // the necessary size of the tool-bar 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();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIToolBar.h

@@ -78 +78 @@
     /** Mac OS X: Defines whether native tool-bar button should be shown. */
     void setShowToolBarButton(bool fShow);
-    /** Mac OS X: Updates native tool-bar layout. */
-    void updateLayout();
 
     /** Mac OS X: Defines branding stuff to be shown.

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp

@@ -1810 +1810 @@
 void UIHelpBrowserWidget::retranslateUi()
 {
-    /* Translate toolbar: */
-#ifdef VBOX_WS_MAC
-    // WORKAROUND:
-    // 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. */
-    if (m_pToolBar)
-        m_pToolBar->updateLayout();
-#endif
     if (m_pTabWidget)
     {

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -895 +895 @@
 void UIVMLogViewerWidget::retranslateUi()
 {
-    /* Translate toolbar: */
-#ifdef VBOX_WS_MAC
-    // WORKAROUND:
-    // 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. */
-    if (m_pToolBar)
-        m_pToolBar->updateLayout();
-#endif
     if (m_pCornerButton)
         m_pCornerButton->setToolTip(tr("Select machines to show their log"));

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -342 +342 @@
     /* Make sure chosen item fetched: */
     sltHandleChooserPaneIndexChange();
-
-#ifdef VBOX_WS_MAC
-    // WORKAROUND:
-    // 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.
-    m_pToolBar->updateLayout();
-#endif
 }
 
@@ -1054 +1045 @@
         }
     }
-
-#ifdef VBOX_WS_MAC
-    // WORKAROUND:
-    // Actually Qt should do that itself but by some unknown reason it sometimes
-    // forget to update toolbar after changing its actions on Cocoa platform.
-    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_New), &UIAction::changed,
-            m_pToolBar, static_cast<void(QIToolBar::*)(void)>(&QIToolBar::update)); // update ambiguity
-    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_Settings), &UIAction::changed,
-            m_pToolBar, static_cast<void(QIToolBar::*)(void)>(&QIToolBar::update)); // update ambiguity
-    connect(actionPool()->action(UIActionIndexMN_M_Machine_S_Discard), &UIAction::changed,
-            m_pToolBar, static_cast<void(QIToolBar::*)(void)>(&QIToolBar::update)); // update ambiguity
-    connect(actionPool()->action(UIActionIndexMN_M_Machine_M_StartOrShow), &UIAction::changed,
-            m_pToolBar, static_cast<void(QIToolBar::*)(void)>(&QIToolBar::update)); // update ambiguity
-
-    // WORKAROUND:
-    // 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.
-    m_pToolBar->updateLayout();
-#endif /* VBOX_WS_MAC */
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumManager.cpp

@@ -197 +197 @@
 void UIMediumManagerWidget::retranslateUi()
 {
-    /* Adjust toolbar: */
-#ifdef VBOX_WS_MAC
-    // WORKAROUND:
-    // 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. */
-    if (m_pToolBar)
-        m_pToolBar->updateLayout();
-#endif
-
     /* Translate tab-widget: */
     if (m_pTabWidget)

trunk/src/VBox/Frontends/VirtualBox/src/networkmanager/UINetworkManager.cpp

@@ -408 +408 @@
 void UINetworkManagerWidget::retranslateUi()
 {
-    /* Adjust toolbar: */
-#ifdef VBOX_WS_MAC
-    // WORKAROUND:
-    // 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.
-    if (m_pToolBar)
-        m_pToolBar->updateLayout();
-#endif /* VBOX_WS_MAC */
-
     /* Translate tab-widget: */
     if (m_pTabWidget)

trunk/src/VBox/Frontends/VirtualBox/src/snapshots/UISnapshotPane.cpp

@@ -658 +658 @@
     /* Translate snapshot tree: */
     m_pSnapshotTree->setWhatsThis(tr("Contains the snapshot tree of the current virtual machine"));
-
-    /* Translate toolbar: */
-#ifdef VBOX_WS_MAC
-    // WORKAROUND:
-    // 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. */
-    if (m_pToolBar)
-        m_pToolBar->updateLayout();
-#endif
 
     /* Translate snapshot tree: */