Changeset 81257 in vbox

Timestamp:

Oct 14, 2019 1:09:01 PM (5 years ago)

Author:

vboxsync

Message:

FE/Qt: Reworking QIMainWindow to be QIWithRestorableGeometry template thus allowing to apply that behavior for other than QMainWindow sub-classes.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (2 diffs)
• src/extensions/QIMainWindow.cpp (deleted)
• src/extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• src/globals/QIWithRestorableGeometry.h (moved) (moved from trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIMainWindow.h ) (5 diffs)
• src/manager/UIVirtualBoxManager.cpp (modified) (5 diffs)
• src/manager/UIVirtualBoxManager.h (modified) (2 diffs)
• src/runtime/information/UIVMInformationDialog.cpp (modified) (1 diff)
• src/runtime/information/UIVMInformationDialog.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -785 +785 @@
         src/extensions/QILineEdit.h \
         src/extensions/QIMainDialog.h \
-        src/extensions/QIMainWindow.h \
         src/extensions/QIManagerDialog.h \
         src/extensions/QIMenu.h \
@@ -1267 +1266 @@
         src/extensions/QILineEdit.cpp \
         src/extensions/QIMainDialog.cpp \
-        src/extensions/QIMainWindow.cpp \
         src/extensions/QIManagerDialog.cpp \
         src/extensions/QIMenu.cpp \

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

@@ -53 +53 @@
 # include "QIDialogButtonBox.h"
 # include "QIFileDialog.h"
-# include "QIMainWindow.h"
 # include "QISplitter.h"
 # include "QIWidgetValidator.h"
+# include "QIWithRestorableGeometry.h"
 # include "VBoxUtils.h"
 # include "UIIconPool.h"
@@ -458 +458 @@
 
 
-/** QIMainWindow extension
+/** QMainWindow extension
   * providing Extra Data Manager with UI features. */
-class UIExtraDataManagerWindow : public QIMainWindow
+class UIExtraDataManagerWindow : public QIWithRestorableGeometry<QMainWindow>
 {
     Q_OBJECT;

trunk/src/VBox/Frontends/VirtualBox/src/globals/QIWithRestorableGeometry.h

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBox Qt GUI - QIMainWindow class declaration.
+ * VBox Qt GUI - QIWithRestorableGeometry class declaration.
  */
 
@@ -16 +16 @@
  */
 
-#ifndef FEQT_INCLUDED_SRC_extensions_QIMainWindow_h
-#define FEQT_INCLUDED_SRC_extensions_QIMainWindow_h
+#ifndef FEQT_INCLUDED_SRC_globals_QIWithRestorableGeometry_h
+#define FEQT_INCLUDED_SRC_globals_QIWithRestorableGeometry_h
 #ifndef RT_WITHOUT_PRAGMA_ONCE
 # pragma once
@@ -25 +25 @@
 #include <QMainWindow>
 #include <QRect>
+#include <QResizeEvent>
 
 /* GUI includes: */
 #include "UILibraryDefs.h"
+#ifdef VBOX_WS_MAC
+# include "VBoxUtils-darwin.h"
+#endif
+#ifdef VBOX_WS_X11
+# include "UICommon.h"
+# include "UIDesktopWidgetWatchdog.h"
+#endif
 
-/* Forward declarations: */
-class QWidget;
-
-/** QMainWindow extension providing GUI
-  * with the extended geometry management support. */
-class SHARED_LIBRARY_STUFF QIMainWindow : public QMainWindow
+/** Template with geometry saving/restoring capabilities. */
+template <class Base>
+class QIWithRestorableGeometry : public Base
 {
-    Q_OBJECT;
-
 public:
 
     /** Constructs main window passing @a pParent and @a enmFlags to base-class. */
-    QIMainWindow(QWidget *pParent = 0, Qt::WindowFlags enmFlags = 0);
+    QIWithRestorableGeometry(QWidget *pParent = 0, Qt::WindowFlags enmFlags = 0)
+        : Base(pParent, enmFlags)
+    {}
 
 protected:
 
     /** Handles move @a pEvent. */
-    virtual void moveEvent(QMoveEvent *pEvent) /* override */;
+    virtual void moveEvent(QMoveEvent *pEvent) /* override */
+    {
+        /* 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
+        }
+    }
+
     /** Handles resize @a pEvent. */
-    virtual void resizeEvent(QResizeEvent *pEvent) /* override */;
+    virtual void resizeEvent(QResizeEvent *pEvent) /* override */
+    {
+        /* 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());
+        }
+    }
 
     /** Returns whether the window should be maximized when geometry being restored. */
@@ -54 +99 @@
 
     /** Restores the window geometry to passed @a rect. */
-    void restoreGeometry(const QRect &rect);
+    void restoreGeometry(const QRect &rect)
+    {
+        m_geometry = rect;
+#if defined(VBOX_WS_MAC) || defined(VBOX_WS_WIN)
+        /* Use the old approach for OSX/Win: */
+        move(m_geometry.topLeft());
+        resize(m_geometry.size());
+#else
+        /* Use the new approach otherwise: */
+        UICommon::setTopLevelGeometry(this, m_geometry);
+#endif
+
+        /* Maximize (if necessary): */
+        if (shouldBeMaximized())
+            showMaximized();
+    }
 
     /** Returns current window geometry. */
-    QRect currentGeometry() const;
+    QRect currentGeometry() const
+    {
+        return m_geometry;
+    }
+
     /** Returns whether the window is currently maximized. */
-    bool isCurrentlyMaximized() const;
+    bool isCurrentlyMaximized() const
+    {
+#ifdef VBOX_WS_MAC
+        return ::darwinIsWindowMaximized(this);
+#else
+        return isMaximized();
+#endif
+    }
 
 private:
@@ -67 +138 @@
 };
 
-#endif /* !FEQT_INCLUDED_SRC_extensions_QIMainWindow_h */
+#endif /* !FEQT_INCLUDED_SRC_globals_QIWithRestorableGeometry_h */

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

@@ -128 +128 @@
     /* Ignore for non-active window except for FileOpen event which should be always processed: */
     if (!isActiveWindow() && pEvent->type() != QEvent::FileOpen)
-        return QIWithRetranslateUI<QIMainWindow>::eventFilter(pObject, pEvent);
+        return QMainWindowWithRestorableGeometryAndRetranslateUi::eventFilter(pObject, pEvent);
 
     /* Ignore for other objects: */
     if (qobject_cast<QWidget*>(pObject) &&
         qobject_cast<QWidget*>(pObject)->window() != this)
-        return QIWithRetranslateUI<QIMainWindow>::eventFilter(pObject, pEvent);
+        return QMainWindowWithRestorableGeometryAndRetranslateUi::eventFilter(pObject, pEvent);
 
     /* Which event do we have? */
@@ -150 +150 @@
 
     /* Call to base-class: */
-    return QIWithRetranslateUI<QIMainWindow>::eventFilter(pObject, pEvent);
+    return QMainWindowWithRestorableGeometryAndRetranslateUi::eventFilter(pObject, pEvent);
 }
 #endif /* VBOX_WS_MAC */
@@ -184 +184 @@
     }
     /* Call to base-class: */
-    return QIWithRetranslateUI<QIMainWindow>::event(pEvent);
+    return QMainWindowWithRestorableGeometryAndRetranslateUi::event(pEvent);
 }
 
@@ -190 +190 @@
 {
     /* Call to base-class: */
-    QIWithRetranslateUI<QIMainWindow>::showEvent(pEvent);
+    QMainWindowWithRestorableGeometryAndRetranslateUi::showEvent(pEvent);
 
     /* Is polishing required? */
@@ -211 +211 @@
 {
     /* Call to base-class: */
-    QIWithRetranslateUI<QIMainWindow>::closeEvent(pEvent);
+    QMainWindowWithRestorableGeometryAndRetranslateUi::closeEvent(pEvent);
 
     /* Quit application: */

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

@@ -23 +23 @@
 
 /* Qt includes: */
+#include <QMainWindow>
 #include <QUrl>
 
 /* GUI includes: */
-#include "QIMainWindow.h"
+#include "QIWithRestorableGeometry.h"
 #include "QIWithRetranslateUI.h"
 #include "UICommon.h"
@@ -39 +40 @@
 
 /* Type definitions: */
+typedef QIWithRestorableGeometry<QMainWindow> QMainWindowWithRestorableGeometry;
+typedef QIWithRetranslateUI<QMainWindowWithRestorableGeometry> QMainWindowWithRestorableGeometryAndRetranslateUi;
 typedef QMap<QString, QIManagerDialog*> VMLogViewerMap;
 
-/** Singleton QIMainWindow extension used as VirtualBox Manager instance. */
-class UIVirtualBoxManager : public QIWithRetranslateUI<QIMainWindow>
+/** Singleton QMainWindow extension used as VirtualBox Manager instance. */
+class UIVirtualBoxManager : public QMainWindowWithRestorableGeometryAndRetranslateUi
 {
     Q_OBJECT;

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

@@ -79 +79 @@
 
 UIVMInformationDialog::UIVMInformationDialog(UIMachineWindow *pMachineWindow)
-    : QIWithRetranslateUI<QIMainWindow>(0)
+    : QMainWindowWithRestorableGeometryAndRetranslateUi(0)
     , m_pTabWidget(0)
     , m_pMachineWindow(pMachineWindow)

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

@@ -22 +22 @@
 #endif
 
+/* Qt includes: */
+#include <QMainWindow>
+
 /* GUI includes: */
-#include "QIMainWindow.h"
+#include "QIWithRestorableGeometry.h"
 #include "QIWithRetranslateUI.h"
 
@@ -35 +38 @@
 class UIMachineWindow;
 
+/* Type definitions: */
+typedef QIWithRestorableGeometry<QMainWindow> QMainWindowWithRestorableGeometry;
+typedef QIWithRetranslateUI<QMainWindowWithRestorableGeometry> QMainWindowWithRestorableGeometryAndRetranslateUi;
 
-/** QIMainWindow subclass providing user
+
+/** QMainWindow subclass providing user
   * with the dialog unifying VM details and statistics. */
-class UIVMInformationDialog : public QIWithRetranslateUI<QIMainWindow>
+class UIVMInformationDialog : public QMainWindowWithRestorableGeometryAndRetranslateUi
 {
     Q_OBJECT;