dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UI/Qt: Honor AppKit window drag gesture

Browse source 
macOS can be configured to drag windows with Cmd+Ctrl+click via
NSWindowShouldDragOnGesture. AppKit does not see its usual titlebar
drag path for our frameless Qt windows, so handle the native mouse
down in the AppKit event filter when that default is enabled.

Forward the event to performWindowDragWithEvent before Qt turns it into
normal widget input. This restores the system gesture without changing
behavior for users who have not enabled the default.
This commit is contained in:
Andreas Kling 2026-06-21 00:51:57 +02:00 committed by Andreas Kling
parent 702904f6b3
commit 4b2f404da1
1 changed files with 29 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
UI/Qt/MacWindow.mm
View file

@ -66,6 +66,11 @@ namespace Ladybird {
static NSEvent* s_latest_window_drag_event;
static bool is_window_drag_on_gesture_enabled()
{
return [[NSUserDefaults standardUserDefaults] boolForKey:@"NSWindowShouldDragOnGesture"];
}
static bool is_appkit_event_type(QByteArray const& event_type)
{
return event_type == QByteArrayLiteral("NSEvent")
@ -86,6 +91,25 @@ static bool is_window_drag_event(NSEvent* event)
}
}
static bool should_start_window_drag_for_gesture(NSEvent* event)
{
if (!event || event.type != NSEventTypeLeftMouseDown)
return false;
if (!is_window_drag_on_gesture_enabled())
return false;
auto modifier_flags = event.modifierFlags & NSEventModifierFlagDeviceIndependentFlagsMask;
if ((modifier_flags & (NSEventModifierFlagCommand | NSEventModifierFlagControl)) != (NSEventModifierFlagCommand | NSEventModifierFlagControl))
return false;
auto* window = event.window;
if (!window || !window.isMovable || (window.styleMask & NSWindowStyleMaskFullScreen))
return false;
return true;
}
class LadybirdAppKitEventCaptureFilter final : public QAbstractNativeEventFilter {
public:
virtual bool nativeEventFilter(QByteArray const& event_type, void* message, qintptr*) override
@ -94,6 +118,11 @@ public:
return false;
auto* event = static_cast<NSEvent*>(message);
if (should_start_window_drag_for_gesture(event)) {
[event.window performWindowDragWithEvent:event];
return true;
}
if (!is_window_drag_event(event))
return false;