Changeset 57590 in vbox for trunk/src/VBox

Timestamp:

Sep 1, 2015 2:06:35 PM (10 years ago)

Author:

vboxsync

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

102438

Message:

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

Location:

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

Files:

• VBoxGlobal.cpp (modified) (2 diffs)
• VBoxGlobal.h (modified) (2 diffs)

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

@@ -346 +346 @@
 }
 
+int VBoxGlobal::screenNumber(const QWidget *pWidget) const
+{
+    /* Redirect call to QDesktopWidget: */
+    return QApplication::desktop()->screenNumber(pWidget);
+}
+
+int VBoxGlobal::screenNumber(const QPoint &point) const
+{
+    /* Redirect call to QDesktopWidget: */
+    return QApplication::desktop()->screenNumber(point);
+}
+
 const QRect VBoxGlobal::screenGeometry(int iHostScreenIndex /* = -1 */) const
 {
@@ -372 +384 @@
 }
 
-const QRect VBoxGlobal::screenGeometry(QWidget *pWidget /* = 0 */) const
+const QRect VBoxGlobal::screenGeometry(const QWidget *pWidget) const
 {
     /* Redirect call to existing wrapper: */
-    return screenGeometry(QApplication::desktop()->screenNumber(pWidget));
-}
-
-const QRect VBoxGlobal::availableGeometry(QWidget *pWidget /* = 0 */) const
+    return screenGeometry(screenNumber(pWidget));
+}
+
+const QRect VBoxGlobal::availableGeometry(const QWidget *pWidget) const
 {
     /* Redirect call to existing wrapper: */
-    return availableGeometry(QApplication::desktop()->screenNumber(pWidget));
+    return availableGeometry(screenNumber(pWidget));
+}
+
+const QRect VBoxGlobal::screenGeometry(const QPoint &point) const
+{
+    /* Redirect call to existing wrapper: */
+    return screenGeometry(screenNumber(point));
+}
+
+const QRect VBoxGlobal::availableGeometry(const QPoint &point) const
+{
+    /* Redirect call to existing wrapper: */
+    return availableGeometry(screenNumber(point));
 }
 

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

@@ -145 +145 @@
         int screenCount() const;
 
+        /** Returns the index of the screen which contains contains @a pWidget. */
+        int screenNumber(const QWidget *pWidget) const;
+        /** Returns the index of the screen which contains contains @a point. */
+        int screenNumber(const QPoint &point) const;
+
         /** Returns the geometry of the host-screen with @a iHostScreenIndex.
           * @note The default screen is used if @a iHostScreenIndex is -1. */
@@ -152 +157 @@
         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;
+        /** Returns the geometry of the host-screen which contains @a pWidget. */
+        const QRect screenGeometry(const QWidget *pWidget) const;
+        /** Returns the available-geometry of the host-screen which contains @a pWidget. */
+        const QRect availableGeometry(const QWidget *pWidget) const;
+
+        /** Returns the geometry of the host-screen which contains @a point. */
+        const QRect screenGeometry(const QPoint &point) const;
+        /** Returns the available-geometry of the host-screen which contains @a point. */
+        const QRect availableGeometry(const QPoint &point) const;
     /** @} */