Changeset 81248 in vbox

Timestamp:

Oct 14, 2019 10:31:23 AM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: QIMainWindow: Move geometry updating code from children like VirtualBox Manager, Extra-data Manager and Session Information dialog to base-class.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extensions/QIMainWindow.cpp (modified) (3 diffs)
• extensions/QIMainWindow.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• manager/UIVirtualBoxManager.cpp (modified) (2 diffs)
• manager/UIVirtualBoxManager.h (modified) (1 diff)
• runtime/information/UIVMInformationDialog.cpp (modified) (1 diff)
• runtime/information/UIVMInformationDialog.h (modified) (1 diff)

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

@@ -16 +16 @@
  */
 
+/* Qt includes: */
+#include <QResizeEvent>
+
 /* GUI includes: */
 #include "QIMainWindow.h"
 #ifdef VBOX_WS_X11
 # include "UICommon.h"
+# include "UIDesktopWidgetWatchdog.h"
 #endif
 
@@ -28 +32 @@
 }
 
+void QIMainWindow::moveEvent(QMoveEvent *pEvent)
+{
+    /* Call to base-class: */
+    QMainWindow::moveEvent(pEvent);
+
+#ifdef VBOX_WS_X11
+    /* Prevent further handling if fake screen detected: */
+    if (gpDesktop->isFakeScreenDetected())
+        return;
+#endif
+
+    /* Prevent handling for yet/already invisible window or if window is in minimized state: */
+    if (isVisible() && (windowState() & Qt::WindowMinimized) == 0)
+    {
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
+        /* Use the old approach for OSX/Win: */
+        m_geometry.moveTo(frameGeometry().x(), frameGeometry().y());
+#else
+        /* Use the new approach otherwise: */
+        m_geometry.moveTo(geometry().x(), geometry().y());
+#endif
+    }
+}
+
+void QIMainWindow::resizeEvent(QResizeEvent *pEvent)
+{
+    /* Call to base-class: */
+    QMainWindow::resizeEvent(pEvent);
+
+#ifdef VBOX_WS_X11
+    /* Prevent handling if fake screen detected: */
+    if (gpDesktop->isFakeScreenDetected())
+        return;
+#endif
+
+    /* Prevent handling for yet/already invisible window or if window is in minimized state: */
+    if (isVisible() && (windowState() & Qt::WindowMinimized) == 0)
+    {
+        QResizeEvent *pResizeEvent = static_cast<QResizeEvent*>(pEvent);
+        m_geometry.setSize(pResizeEvent->size());
+    }
+}
+
 void QIMainWindow::restoreGeometry()
 {
@@ -34 +81 @@
     move(m_geometry.topLeft());
     resize(m_geometry.size());
-#else /* !VBOX_WS_MAC && !VBOX_WS_WIN */
+#else
     /* Use the new approach otherwise: */
     UICommon::setTopLevelGeometry(this, m_geometry);
-#endif /* !VBOX_WS_MAC && !VBOX_WS_WIN */
+#endif
 
     /* Maximize (if necessary): */

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

@@ -45 +45 @@
 protected:
 
+    /** Handles move @a pEvent. */
+    virtual void moveEvent(QMoveEvent *pEvent) /* override */;
+    /** Handles resize @a pEvent. */
+    virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
+
     /** Returns whether the window should be maximized when geometry being restored. */
     virtual bool shouldBeMaximized() const { return false; }

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -573 +573 @@
         /** Cleanup instance. */
         void cleanup();
-    /** @} */
-
-    /** @name Event Processing
-      * @{ */
-        /** Common event-handler. */
-        bool event(QEvent *pEvent);
     /** @} */
 
@@ -1729 +1723 @@
 }
 
-bool UIExtraDataManagerWindow::event(QEvent *pEvent)
-{
-    /* Pre-process through base-class: */
-    bool fResult = QIMainWindow::event(pEvent);
-
-    /* Process required events: */
-    switch (pEvent->type())
-    {
-        /* Handle every Resize and Move we keep track of the geometry. */
-        case QEvent::Resize:
-        {
-            if (isVisible() && (windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
-            {
-                QResizeEvent *pResizeEvent = static_cast<QResizeEvent*>(pEvent);
-                m_geometry.setSize(pResizeEvent->size());
-            }
-            break;
-        }
-        case QEvent::Move:
-        {
-            if (isVisible() && (windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
-            {
-#ifdef VBOX_WS_MAC
-                QMoveEvent *pMoveEvent = static_cast<QMoveEvent*>(pEvent);
-                m_geometry.moveTo(pMoveEvent->pos());
-#else /* !VBOX_WS_MAC */
-                m_geometry.moveTo(geometry().x(), geometry().y());
-#endif /* !VBOX_WS_MAC */
-            }
-            break;
-        }
-        default:
-            break;
-    }
-
-    /* Return result: */
-    return fResult;
-}
-
 void UIExtraDataManagerWindow::updateActionsAvailability()
 {

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

@@ -18 +18 @@
 /* Qt includes: */
 #include <QMenuBar>
-#include <QResizeEvent>
 #include <QStandardPaths>
 #include <QStatusBar>
@@ -188 +187 @@
 }
 
-void UIVirtualBoxManager::moveEvent(QMoveEvent *pEvent)
-{
-    /* Call to base-class: */
-    QIWithRetranslateUI<QIMainWindow>::moveEvent(pEvent);
-
-#ifdef VBOX_WS_X11
-    /* Prevent further handling if fake screen detected: */
-    if (gpDesktop->isFakeScreenDetected())
-        return;
-#endif
-
-    /* Prevent handling for yet/already invisible window or if window is in minimized state: */
-    if (isVisible() && (windowState() & Qt::WindowMinimized) == 0)
-    {
-#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
-        m_geometry.moveTo(frameGeometry().x(), frameGeometry().y());
-#else
-        m_geometry.moveTo(geometry().x(), geometry().y());
-#endif
-    }
-}
-
-void UIVirtualBoxManager::resizeEvent(QResizeEvent *pEvent)
-{
-    /* Call to base-class: */
-    QIWithRetranslateUI<QIMainWindow>::resizeEvent(pEvent);
-
-#ifdef VBOX_WS_X11
-    /* Prevent handling if fake screen detected: */
-    if (gpDesktop->isFakeScreenDetected())
-        return;
-#endif
-
-    /* Prevent handling for yet/already invisible window or if window is in minimized state: */
-    if (isVisible() && (windowState() & Qt::WindowMinimized) == 0)
-    {
-        QResizeEvent *pResizeEvent = static_cast<QResizeEvent*>(pEvent);
-        m_geometry.setSize(pResizeEvent->size());
-    }
-}
-
 void UIVirtualBoxManager::showEvent(QShowEvent *pEvent)
 {

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.h

@@ -91 +91 @@
         /** Handles any Qt @a pEvent. */
         virtual bool event(QEvent *pEvent) /* override */;
-        /** Handles move @a pEvent. */
-        virtual void moveEvent(QMoveEvent *pEvent) /* override */;
-        /** Handles resize @a pEvent. */
-        virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
         /** Handles show @a pEvent. */
         virtual void showEvent(QShowEvent *pEvent) /* override */;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.cpp

@@ -116 +116 @@
 }
 
-bool UIVMInformationDialog::event(QEvent *pEvent)
-{
-    /* Pre-process through base-class: */
-    const bool fResult = QIMainWindow::event(pEvent);
-
-    /* Process required events: */
-    switch (pEvent->type())
-    {
-        /* Handle Resize event to keep track of the geometry: */
-        case QEvent::Resize:
-        {
-            if (isVisible() && (windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
-            {
-                QResizeEvent *pResizeEvent = static_cast<QResizeEvent*>(pEvent);
-                m_geometry.setSize(pResizeEvent->size());
-            }
-            break;
-        }
-        /* Handle Move event to keep track of the geometry: */
-        case QEvent::Move:
-        {
-            if (isVisible() && (windowState() & (Qt::WindowMaximized | Qt::WindowMinimized | Qt::WindowFullScreen)) == 0)
-            {
-#ifdef VBOX_WS_MAC
-                QMoveEvent *pMoveEvent = static_cast<QMoveEvent*>(pEvent);
-                m_geometry.moveTo(pMoveEvent->pos());
-#else /* VBOX_WS_MAC */
-                m_geometry.moveTo(geometry().x(), geometry().y());
-#endif /* !VBOX_WS_MAC */
-            }
-            break;
-        }
-        default:
-            break;
-    }
-
-    /* Return result: */
-    return fResult;
-}
-
 void UIVMInformationDialog::sltHandlePageChanged(int iIndex)
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/information/UIVMInformationDialog.h

@@ -61 +61 @@
     void retranslateUi();
 
-    /** Handles any Qt @a pEvent. */
-    bool event(QEvent *pEvent);
-
 private slots: