Changeset 57540 in vbox for trunk/src/VBox

Timestamp:

Aug 25, 2015 4:46:17 PM (10 years ago)

Author:

vboxsync

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

102352

Message:

FE/Qt: 7958: Adding few more screen-geometry related wrappers to VBoxGlobal. Will be reused in other places.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/globals

Files:

• VBoxGlobal.cpp (modified) (1 diff)
• VBoxGlobal.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

@@ -364 +364 @@
     /* Redirect call to QDesktopWidget: */
     return QApplication::desktop()->availableGeometry(iHostScreenIndex);
+}
+
+const QRect     VBoxGlobal::screenGeometry(QWidget *pWidget /* = 0 */) const
+{
+    /* Redirect to existing wrapper: */
+    return screenGeometry(QApplication::desktop()->screenNumber(pWidget));
+}
+
+const QRect     VBoxGlobal::availableGeometry(QWidget *pWidget /* = 0 */) const
+{
+    /* Redirect to existing wrapper: */
+    return availableGeometry(QApplication::desktop()->screenNumber(pWidget));
 }
 

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

@@ -140 +140 @@
     bool isVBoxSVCAvailable() const { return m_fVBoxSVCAvailable; }
 
-    /** Returns the geometry of the host-screen with @a iHostScreenIndex.
-      * @note The default screen is used if @a iHostScreenIndex is -1. */
-    const QRect screenGeometry(int iHostScreenIndex = -1) const;
-    /** Returns the available-geometry of the host-screen with @a iHostScreenIndex.
-      * @note The default screen is used if @a iHostScreenIndex is -1. */
-    const QRect availableGeometry(int iHostScreenIndex = -1) const;
+    /** @name Host-screen geometry stuff
+      * @{ */
+        /** Returns the geometry of the host-screen with @a iHostScreenIndex.
+          * @note The default screen is used if @a iHostScreenIndex is -1. */
+        const QRect     screenGeometry(int iHostScreenIndex = -1) const;
+        /** Returns the available-geometry of the host-screen with @a iHostScreenIndex.
+          * @note The default screen is used if @a iHostScreenIndex is -1. */
+        const QRect     availableGeometry(int iHostScreenIndex = -1) const;
+
+        /** Returns the geometry of the host-screen which contains @a pWidget.
+          * @note The default screen is used if @a pWidget is 0. */
+        const QRect     screenGeometry(QWidget *pWidget = 0) const;
+        /** Returns the available-geometry of the host-screen which contains @a pWidget.
+          * @note The default screen is used if @a pWidget is 0. */
+        const QRect     availableGeometry(QWidget *pWidget = 0) const;
+    /** @} */
 
     VBoxGlobalSettings &settings() { return gset; }
@@ -533 +543 @@
     X11WMType m_enmWindowManagerType;
 
-    /** X11: Holds the desktop-widget watchdog instance aware of host-screen geometry changes. */
-    UIDesktopWidgetWatchdog *m_pDesktopWidgetWatchdog;
+    /** @name Host-screen geometry stuff
+      * @{ */
+        /** X11: Holds the desktop-widget watchdog instance aware of host-screen geometry changes. */
+        UIDesktopWidgetWatchdog *m_pDesktopWidgetWatchdog;
+    /** @} */
 #endif /* Q_WS_X11 */
 
@@ -541 +554 @@
     /** The --restore-current option. */
     bool mRestoreCurrentSnapshot;
+
     /** @name Ad-hoc VM reconfiguration.
      * @{ */
-    /** Floppy image. */
-    QString m_strFloppyImage;
-    /** DVD image. */
-    QString m_strDvdImage;
+        /** Floppy image. */
+        QString m_strFloppyImage;
+        /** DVD image. */
+        QString m_strDvdImage;
     /** @} */
+
     /** @name VMM options
      * @{ */
-    /** The --disable-patm option. */
-    bool mDisablePatm;
-    /** The --disable-csam option. */
-    bool mDisableCsam;
-    /** The --recompile-supervisor option. */
-    bool mRecompileSupervisor;
-    /** The --recompile-user option. */
-    bool mRecompileUser;
-    /** The --execute-all-in-iem option. */
-    bool mExecuteAllInIem;
-    /** The --warp-factor option value. */
-    uint32_t mWarpPct;
+        /** The --disable-patm option. */
+        bool mDisablePatm;
+        /** The --disable-csam option. */
+        bool mDisableCsam;
+        /** The --recompile-supervisor option. */
+        bool mRecompileSupervisor;
+        /** The --recompile-user option. */
+        bool mRecompileUser;
+        /** The --execute-all-in-iem option. */
+        bool mExecuteAllInIem;
+        /** The --warp-factor option value. */
+        uint32_t mWarpPct;
     /** @} */