Changeset 55543 in vbox

Timestamp:

Apr 30, 2015 10:57:46 AM (9 years ago)

Author:

vboxsync

Message:

Frontends: use approvals for VBoxEventType_OnCanShowWindow, workaround for VBoxEventType_OnShowWindow.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxHeadless/VBoxHeadless.cpp (modified) (1 diff)
• VBoxSDL/VBoxSDL.cpp (modified) (2 diffs)
• VirtualBox/src/globals/UIMainEventListener.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -235 +235 @@
                 ComPtr<IShowWindowEvent> swev = aEvent;
                 Assert(swev);
-                swev->COMSETTER(WinId)(0);
+                /* Ignore the event, WinId is either still zero or some other listener assigned it. */
+                NOREF(swev); /* swev->COMSETTER(WinId)(0); */
                 break;
             }

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -529 +529 @@
                 if (!SDL_GetWMInfo(&info))
                     pCSWEv->AddVeto(NULL);
+                else
+                    pCSWEv->AddApproval(NULL);
 #endif
                 break;
@@ -537 +539 @@
                 ComPtr<IShowWindowEvent> pSWEv = aEvent;
                 Assert(pSWEv);
+                LONG64 winId = 0;
+                pSWEv->COMGETTER(WinId)(&winId);
+                if (winId != 0)
+                    break; /* WinId already set by some other listener. */
 #ifndef RT_OS_DARWIN
                 SDL_SysWMinfo info;

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

@@ -242 +242 @@
             if (fVeto)
                 es.AddVeto(strReason);
+            else
+                es.AddApproval(strReason);
             break;
         }
@@ -248 +250 @@
             CShowWindowEvent es(pEvent);
             /* Has to be done in place to give an answer: */
-            LONG64 winId;
+            LONG64 winId = es.GetWinId();
+            if (winId != 0)
+                break; /* Already set by some listener. */
             emit sigShowWindow(winId);
             es.SetWinId(winId);