Changeset 61963 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jun 30, 2016 4:39:55 PM (9 years ago)

Author:

vboxsync

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

108409

Message:

Reverting r108269 and r108260 as it was temporary and unstable workaround.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen

Files:

• UIMachineWindowFullscreen.cpp (modified) (4 diffs)
• UIMachineWindowFullscreen.h (modified) (2 diffs)

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

@@ -23 +23 @@
 # include <QMenu>
 # include <QTimer>
-# if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
+# ifdef VBOX_WS_WIN
 #  if QT_VERSION >= 0x050000
 #   include <QWindow>
 #  endif /* QT_VERSION >= 0x050000 */
-# endif /* VBOX_WS_WIN || VBOX_WS_X11 */
+# endif /* VBOX_WS_WIN */
 
 /* GUI includes: */
@@ -196 +196 @@
 }
 #endif /* VBOX_WS_MAC */
-
-#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
-void UIMachineWindowFullscreen::sltShowMinimized()
-{
-# if QT_VERSION < 0x050000
-    /* Minimize window: */
-    showMinimized();
-# else /* QT_VERSION >= 0x050000 */
-#  if defined(VBOX_WS_WIN)
-    /* Minimize window: */
-    showMinimized();
-#  else /* VBOX_WS_X11 */
-    /* Minimize window and reset it's state to NONE: */
-    setWindowState(Qt::WindowNoState);
-    windowHandle()->showMinimized();
-
-    /* If there is mini-toolbar: */
-    if (m_pMiniToolBar)
-    {
-        /* Hide mini-toolbar and reset it's state to NONE: */
-        m_pMiniToolBar->setWindowState(Qt::WindowNoState);
-        m_pMiniToolBar->hide();
-    }
-#  endif /* VBOX_WS_X11 */
-# endif /* QT_VERSION >= 0x050000 */
-}
-#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
 void UIMachineWindowFullscreen::prepareVisualState()
@@ -286 +259 @@
         m_pMiniToolBar->addMenus(actionPool()->menus());
         connect(m_pMiniToolBar, SIGNAL(sigMinimizeAction()),
-                this, SLOT(sltShowMinimized()), Qt::QueuedConnection);
+                this, SLOT(showMinimized()), Qt::QueuedConnection);
         connect(m_pMiniToolBar, SIGNAL(sigExitAction()),
                 actionPool()->action(UIActionIndexRT_M_View_T_Fullscreen), SLOT(trigger()));
@@ -629 +602 @@
 #endif /* VBOX_WS_WIN || VBOX_WS_X11 */
 
-#ifdef VBOX_WS_X11
-# if QT_VERSION >= 0x050000
-void UIMachineWindowFullscreen::changeEvent(QEvent *pEvent)
-{
-    /* Depending on event type: */
-    switch (pEvent->type())
-    {
-        case QEvent::WindowStateChange:
-        {
-            /* Restore necessary mode view on changing state from Minimized to None: */
-            QWindowStateChangeEvent *pChangeEvent = static_cast<QWindowStateChangeEvent*>(pEvent);
-            if (pChangeEvent->oldState() == Qt::WindowMinimized && windowState() == Qt::WindowNoState)
-                showInNecessaryMode();
-            break;
-        }
-    }
-    /* Call to base-class: */
-    UIMachineWindow::changeEvent(pEvent);
-}
-# endif /* QT_VERSION >= 0x050000 */
-#endif /* VBOX_WS_X11 */
-
 #ifdef VBOX_WS_WIN
 # if QT_VERSION >= 0x050000

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

@@ -76 +76 @@
 #endif /* RT_OS_DARWIN */
 
-#if defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
-    /** Performs window minimization the tricky way. */
-    void sltShowMinimized();
-#endif /* VBOX_WS_WIN || VBOX_WS_X11 */
-
 private:
 
@@ -106 +101 @@
     void updateAppearanceOf(int iElement);
 #endif /* VBOX_WS_WIN || VBOX_WS_X11 */
-
-#ifdef VBOX_WS_X11
-# if QT_VERSION >= 0x050000
-    /** Handles @a pEvent about state change. */
-    void changeEvent(QEvent *pEvent);
-# endif /* QT_VERSION >= 0x050000 */
-#endif /* VBOX_WS_X11 */
 
 #ifdef VBOX_WS_WIN