Changeset 52315 in vbox for trunk/src/VBox/Frontends

Timestamp:

Aug 7, 2014 2:11:33 PM (11 years ago)

Author:

vboxsync

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

95433

Message:

FE/Qt: Just a coding-style fix for r95431 and r95432.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (2 diffs)
• globals/VBoxGlobal.h (modified) (2 diffs)
• runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (3 diffs)

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

@@ -3405 +3405 @@
 }
 
+#ifdef Q_WS_X11
+/* static */
+bool VBoxGlobal::setFullScreenMonitorX11(QWidget *pWidget, ulong uScreenId)
+{
+    return XXSendClientMessage(pWidget->x11Info().display(),
+                               pWidget->window()->winId(),
+                               "_NET_WM_FULLSCREEN_MONITORS",
+                               uScreenId, uScreenId, uScreenId, uScreenId,
+                               1 /* Source indication (1 = normal application) */);
+}
+#endif /* Q_WS_X11 */
+
 /**
  *  Removes the accelerator mark (the ampersand symbol) from the given string
@@ -4662 +4674 @@
 }
 
-#ifdef Q_WS_X11
-bool VBoxGlobal::setFullScreenMonitorX11(QWidget *pWidget,
-                                         unsigned long cScreen)
-{
-    return XXSendClientMessage(pWidget->x11Info().display(),
-                               pWidget->window()->winId(),
-                               "_NET_WM_FULLSCREEN_MONITORS", cScreen, cScreen,
-                               cScreen, cScreen, 1
-                               /* Source indication (1 = normal application) */
-                              );
-}
-#endif

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

@@ -120 +120 @@
     bool switchToMachine(CMachine &machine);
     bool launchMachine(CMachine &machine, bool fHeadless = false);
-#ifdef Q_WS_X11
-    bool setFullScreenMonitorX11(QWidget *pWidget, unsigned long cScreen);
-#endif
 
     bool isVMConsoleProcess() const { return !vmUuid.isNull(); }
@@ -322 +319 @@
 
     static bool activateWindow (WId aWId, bool aSwitchDesktop = true);
+
+#ifdef Q_WS_X11
+    /** X11: Performs mapping of the passed @a pWidget to host-screen with passed @a uScreenId. */
+    static bool setFullScreenMonitorX11(QWidget *pWidget, ulong uScreenId);
+#endif /* Q_WS_X11 */
 
     static QString removeAccelMark (const QString &aText);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -300 +300 @@
     resize(workingArea.size());
 #elif defined(Q_WS_X11)
-    /* Any more-or-less modern window manager provides special mechanisms for
-     * multi-monitor resizing.  We may fail on very old ones, but since we
-     * do not test them I prefer not to write speculative code to make them
-     * work. */
+    /* Any more-or-less modern window manager provides special mechanisms for multi-monitor resizing.
+     * We may fail on very old ones, but since we do not test them we prefer not to write
+     * speculative code to make them work. */
 #endif /* !Q_WS_MAC */
     /* Adjust guest screen size if necessary: */
@@ -332 +331 @@
 
     /* Make sure this window is maximized and placed on valid screen: */
-    /** @todo Only needed for legacy window managers on X11 which we do not
-     *        test; therefore this may not help there.  Better to just refuse
-     *        to support them? */
+    /** @todo Only needed for legacy window managers on X11 which we do not test;
+     *        therefore this may not help there. Better to just refuse to support them? */
     placeOnScreen();
 
@@ -348 +346 @@
 
 #ifdef Q_WS_X11
-    /* This tells recent window managers which screen(s) a window should be
-     * mapped to.  Apparently some window managers will not respond to requests
-     * for unmapped windows, so do this after the call to showFullScreen(). */
-    vboxGlobal().setFullScreenMonitorX11(this, pFullscreenLogic
-                                                  ->hostScreenForGuestScreen
-                                                      (m_uScreenId));
+    /* Tell recent window managers which screen this window should be mapped to.
+     * Apparently some window managers will not respond to requests for
+     * unmapped windows, so do this *after* the call to showFullScreen(). */
+    VBoxGlobal::setFullScreenMonitorX11(this, pFullscreenLogic->hostScreenForGuestScreen(m_uScreenId));
 #endif /* Q_WS_X11 */
 }