Changeset 75672 in vbox

Timestamp:

Nov 22, 2018 3:15:29 PM (6 years ago)

Author:

vboxsync

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

126866

Message:

FE/Qt: bugref:8694: Make sure Close VM Dialog is opened at proper position in multi-screen environment with different system scale-factors.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIVMCloseDialog.cpp (modified) (2 diffs)
• UIVMCloseDialog.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp

@@ -104 +104 @@
 bool UIVMCloseDialog::event(QEvent *pEvent)
 {
-    /* Handle know event types: */
+    /* Pre-process in base-class: */
+    const bool fResult = QIWithRetranslateUI<QIDialog>::event(pEvent);
+
+    /* Post-process know event types: */
     switch (pEvent->type())
     {
-        case QEvent::Show:
         case QEvent::ScreenChangeInternal:
         {
             /* Update pixmaps: */
             updatePixmaps();
-
-            // NOTE:
-            // This thing works after QEvent::Show but isn't
-            // working after QEvent::ScreenChangeInternal,
-            // because it is too early, layout isn't calculated.
-            // We want to "force" it to work, just no idea how.
-            // Resize to minimum size-hint:
-            resize(minimumSizeHint());
-
             break;
         }
@@ -127 +120 @@
     }
 
+    /* Return pre-processed result: */
+    return fResult;
+}
+
+void UIVMCloseDialog::showEvent(QShowEvent *pEvent)
+{
+    /* Update pixmaps: */
+    updatePixmaps();
+
     /* Call to base-class: */
-    return QIWithRetranslateUI<QIDialog>::event(pEvent);
+    QIWithRetranslateUI<QIDialog>::showEvent(pEvent);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.h

@@ -63 +63 @@
     /** Handles any Qt @a pEvent. */
     virtual bool event(QEvent *pEvent) /* override */;
+
+    /** Handles show @a pEvent. */
+    virtual void showEvent(QShowEvent *pEvent) /* override */;
 
     /** Handles translation event. */