Changeset 86081 in vbox

Timestamp:

Sep 10, 2020 11:41:22 AM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9827: A bit of fixes for QIMainDialog and UISettingsDialog polishing stuff; A call to corresponding virtual event handler should be guarded itself, cause it's virtual; Sub-classes should adjust geometry before base-class polishing call, not after it.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIMainDialog.cpp (modified) (2 diffs)
• settings/UISettingsDialog.cpp (modified) (3 diffs)
• settings/UISettingsDialog.h (modified) (2 diffs)

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

@@ -218 +218 @@
 void QIMainDialog::showEvent(QShowEvent *pEvent)
 {
-    /* Call to polish-event: */
-    polishEvent(pEvent);
+    /* Polish dialog if necessary: */
+    if (!m_fPolished)
+    {
+        polishEvent(pEvent);
+        m_fPolished = true;
+    }
 
     /* Call to base-class: */
@@ -227 +231 @@
 void QIMainDialog::polishEvent(QShowEvent *)
 {
-    /* Make sure we should polish dialog: */
-    if (m_fPolished)
-        return;
-
     /* Explicit centering according to our parent: */
     if (m_fIsAutoCentering)
         UICommon::centerWidget(this, parentWidget(), false);
-
-    /* Mark dialog as polished: */
-    m_fPolished = true;
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -53 +53 @@
     , m_pSelector(0)
     , m_pStack(0)
-    , m_fPolished(false)
     , m_enmConfigurationAccessLevel(ConfigurationAccessLevel_Null)
     , m_pSerializeProcess(0)
@@ -268 +267 @@
 }
 
-void UISettingsDialog::showEvent(QShowEvent *pEvent)
-{
-    /* Base-class processing: */
-    QIMainDialog::showEvent(pEvent);
-
-    /* One may think that QWidget::polish() is the right place to do things
-     * below, but apparently, by the time when QWidget::polish() is called,
-     * the widget style & layout are not fully done, at least the minimum
-     * size hint is not properly calculated. Since this is sometimes necessary,
-     * we provide our own "polish" implementation. */
-    if (m_fPolished)
-        return;
-
-    m_fPolished = true;
-
-    int iMinWidth = m_pSelector->minWidth();
+void UISettingsDialog::polishEvent(QShowEvent *pEvent)
+{
+    /* Check what's the minimum selector size: */
+    const int iMinWidth = m_pSelector->minWidth();
 
 #ifdef VBOX_WS_MAC
@@ -337 +324 @@
 
 #endif /* VBOX_WS_MAC */
+
+    /* Call to base-class: */
+    QIWithRetranslateUI<QIMainDialog>::polishEvent(pEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h

@@ -91 +91 @@
     /** Handles translation event. */
     virtual void retranslateUi() /* override */;
-    /** Handles show @a pEvent. */
-    virtual void showEvent(QShowEvent *pEvent) /* override */;
+    /** Handles first show @a pEvent. */
+    virtual void polishEvent(QShowEvent *pEvent) /* override */;
 
     /** Returns the serialize process instance. */
@@ -170 +170 @@
     void assignValidator(UISettingsPage *pPage);
 
-    /** Holds whether the dialog is polished. */
-    bool  m_fPolished;
-
     /** Holds configuration access level. */
     ConfigurationAccessLevel  m_enmConfigurationAccessLevel;