Changeset 10519 in vbox for trunk/src/VBox/Frontends/VirtualBox4/include/VBoxToolBar.h

Timestamp:

Jul 11, 2008 12:40:01 PM (16 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Try to fix the big/white window if the user clicks on a unified
toolbar with the right mouse key.

File:

• trunk/src/VBox/Frontends/VirtualBox4/include/VBoxToolBar.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxToolBar.h

@@ -72 +72 @@
     }
 
+    void setMacToolbar ()
+    {
+#ifdef Q_WS_MAC
+        if (mMainWindow)
+        {
+            mMainWindow->setUnifiedTitleAndToolBarOnMac (true);
+            WindowRef window = ::darwinToWindowRef (this);
+            EventHandlerUPP eventHandler = ::NewEventHandlerUPP (VBoxToolBar::macEventFilter);
+            EventTypeSpec eventTypes[2];
+            eventTypes[0].eventClass = kEventClassMouse;
+            eventTypes[0].eventKind  = kEventMouseDown;
+            eventTypes[1].eventClass = kEventClassMouse;
+            eventTypes[1].eventKind  = kEventMouseUp;
+            InstallWindowEventHandler (window, eventHandler,
+                                       RT_ELEMENTS (eventTypes), eventTypes,
+                                       NULL, NULL);
+        }
+#endif /* Q_WS_MAC */
+    }
+
+#ifdef Q_WS_MAC
+    static pascal OSStatus macEventFilter (EventHandlerCallRef aNextHandler,
+                                           EventRef aEvent, void * /* aUserData */)
+    {
+        UInt32 eclass = GetEventClass (aEvent);
+        if (eclass == kEventClassMouse)
+        {
+            WindowPartCode partCode;
+            GetEventParameter (aEvent, kEventParamWindowPartCode, typeWindowPartCode, NULL, sizeof (WindowPartCode), NULL, &partCode);
+            UInt32 ekind = GetEventKind (aEvent);
+            if (partCode == 15 ||
+                partCode == 4)
+                if(ekind == kEventMouseDown || ekind == kEventMouseUp)
+                {
+                    EventMouseButton button = 0;
+                    GetEventParameter (aEvent, kEventParamMouseButton, typeMouseButton, NULL, sizeof (button), NULL, &button);
+                    if (button != kEventMouseButtonPrimary)
+                        return noErr;
+                }
+        }
+        return CallNextEventHandler (aNextHandler, aEvent);
+    }
+#endif /* Q_WS_MAC */
+
     void setShowToolBarButton (bool aShow)
     {