Changeset 65536 in vbox

Timestamp:

Jan 31, 2017 11:17:57 AM (8 years ago)

Author:

vboxsync

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

113179

Message:

FE/Qt: bugref:8636: Runtime UI: Continue with r113157.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIMiniToolBar.cpp (modified) (10 diffs)
• UIMiniToolBar.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2016 Oracle Corporation
+ * Copyright (C) 2009-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -33 +33 @@
 #  include <QWindow>
 # endif /* VBOX_WS_WIN */
-# if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+# ifdef VBOX_WS_X11
 #  include <QWindowStateChangeEvent>
-# endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+# endif
 
 /* GUI includes: */
@@ -48 +48 @@
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
+
 
 /** UIToolBar reimplementation
@@ -434 +435 @@
     , m_pHoverLeaveTimer(0)
     , m_pAnimation(0)
-#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+#ifdef VBOX_WS_X11
     , m_fIsParentMinimized(false)
-#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+#endif
 {
     /* Prepare: */
@@ -673 +674 @@
         case GeometryType_Full:
         {
-# if QT_VERSION >= 0x050000
             /* Map window onto required screen: */
             Assert(iHostScreen < qApp->screens().size());
             windowHandle()->setScreen(qApp->screens().at(iHostScreen));
-# endif /* QT_VERSION >= 0x050000 */
             /* Set appropriate window size: */
             resize(workingArea.size());
-# if QT_VERSION < 0x050000
-            /* Move window onto required screen: */
-            move(workingArea.topLeft());
-# endif /* QT_VERSION < 0x050000 */
             break;
         }
@@ -896 +891 @@
     }
 
-#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+#ifdef VBOX_WS_X11
     /* If that's window event: */
     if (pWatched == this)
@@ -921 +916 @@
         }
     }
-#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+#endif /* VBOX_WS_X11 */
 
     /* If that's parent window event: */
@@ -979 +974 @@
                 break;
             }
-#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+#ifdef VBOX_WS_X11
             case QEvent::WindowStateChange:
             {
@@ -1001 +996 @@
                 break;
             }
-#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+#endif /* VBOX_WS_X11 */
             default:
                 break;
@@ -1046 +1041 @@
 bool UIMiniToolBar::isParentMinimized() const
 {
-#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
+#ifdef VBOX_WS_X11
     return m_fIsParentMinimized;
-#else /* !VBOX_WS_X11 || QT_VERSION < 0x050000 */
+#else
     return parentWidget()->isMinimized();
-#endif /* !VBOX_WS_X11 || QT_VERSION < 0x050000 */
+#endif
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2016 Oracle Corporation
+ * Copyright (C) 2009-2017 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -37 +37 @@
     GeometryType_Full
 };
+
 
 /** QWidget reimplementation
@@ -184 +185 @@
     UIAnimation *m_pAnimation;
 
-#if defined(VBOX_WS_X11) && QT_VERSION >= 0x050000
-    /** Holds whether the parent is currently minimized.
-      * Used to restore full-screen state when the parent restored again. */
+#ifdef VBOX_WS_X11
+    /** X11: Holds whether the parent is currently minimized.
+      * Used to restore the full-screen/maximized state
+      * when the parent restored again. */
     bool m_fIsParentMinimized;
-#endif /* VBOX_WS_X11 && QT_VERSION >= 0x050000 */
+#endif
 };