Changeset 51252 in vbox

Timestamp:

May 14, 2014 12:51:25 PM (11 years ago)

Author:

vboxsync

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

93705

Message:

FE/Qt: Mac OS X: Runtime UI: Native Full Screen: Additional handling for NSWindowDidFailToEnterFullScreenNotification: Push mode-change directly if session started already.

Location:

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

Files:

• UIMachineLogic.cpp (modified) (1 diff)
• UISession.cpp (modified) (3 diffs)
• UISession.h (modified) (4 diffs)
• fullscreen/UIMachineLogicFullscreen.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp

@@ -770 +770 @@
 {
     /* We should check for entering/exiting requested modes: */
-    connect(uisession(), SIGNAL(sigMachineStarted()), this, SLOT(sltCheckForRequestedVisualStateType()));
+    connect(uisession(), SIGNAL(sigStarted()), this, SLOT(sltCheckForRequestedVisualStateType()));
     connect(uisession(), SIGNAL(sigAdditionsStateChange()), this, SLOT(sltCheckForRequestedVisualStateType()));
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -149 +149 @@
     , m_fSnapshotOperationsAllowed(true)
     /* Common flags: */
+    , m_fIsStarted(false)
     , m_fIsFirstTimeStarted(false)
     , m_fIsIgnoreRuntimeMediumsChanging(false)
@@ -371 +372 @@
 
     /* Warn listeners about machine was started: */
-    emit sigMachineStarted();
+    emit sigStarted();
 }
 
@@ -1015 +1016 @@
 void UISession::prepareConnections()
 {
+    connect(this, SIGNAL(sigStarted()), this, SLOT(sltMarkStarted()));
     connect(this, SIGNAL(sigCloseRuntimeUI()), this, SLOT(sltCloseRuntimeUI()));
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -181 +181 @@
     bool wasPaused() const { return machineStatePrevious() == KMachineState_Paused ||
                                     machineStatePrevious() == KMachineState_TeleportingPausedVM; }
+    bool isStarted() const { return m_fIsStarted; }
     bool isFirstTimeStarted() const { return m_fIsFirstTimeStarted; }
     bool isIgnoreRuntimeMediumsChanging() const { return m_fIsIgnoreRuntimeMediumsChanging; }
@@ -269 +270 @@
 
     /* Session signals: */
-    void sigMachineStarted();
+    void sigStarted();
 
 public slots:
@@ -276 +277 @@
 
 private slots:
+
+    /** Marks machine started. */
+    void sltMarkStarted() { m_fIsStarted = true; }
 
     /* Handler: Close Runtime UI stuff: */
@@ -432 +436 @@
 
     /* Common flags: */
+    bool m_fIsStarted : 1;
     bool m_fIsFirstTimeStarted : 1;
     bool m_fIsIgnoreRuntimeMediumsChanging : 1;

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

@@ -258 +258 @@
         /* Ask session to change 'fullscreen' mode to 'normal': */
         uisession()->setRequestedVisualState(UIVisualStateType_Normal);
+
+        /* If session started already => push mode-change directly: */
+        if (uisession()->isStarted())
+            sltCheckForRequestedVisualStateType();
     }
 }