AUI inconsistency with wxCursor between macOS and Windows (PR #25813)
Tommy Krul
Fix for resetting the cursor back to default when not over a gripper. Solves an inconsistency between macOS and Windows
issue #25811
You can view, comment on, or merge this pull request online at:
https://github.com/wxWidgets/wxWidgets/pull/25813
Commit Summary
- 3c1db45 AUI inconsistency with wxCursor between macOS and Windows
File Changes
(1 file)
- M src/aui/framemanager.cpp (2)
Patch Links:
- https://github.com/wxWidgets/wxWidgets/pull/25813.patch
- https://github.com/wxWidgets/wxWidgets/pull/25813.diff
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#25813)I've created #25814 which would be a better fix, if it works for you — I didn't have time to test it, could you please do it? TIA!
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Tommy Krul
Tommykrul left a comment (wxWidgets/wxWidgets#25813)Great! Will give it a try tomorrow and let you know
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Tommy Krul
Tommykrul left a comment (wxWidgets/wxWidgets#25813)Tried the patch but the behavior seems unchanged. I plan to do some more test, but I build wx offline, so I can't easily inspect the issue in a debugger. Will follow up.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Tommy Krul
Tommykrul left a comment (wxWidgets/wxWidgets#25813)Just as a test, I put a assert(false); at the top of the new wxWindowMac::WXUpdateCursor() and it seems like it never gets triggered when the cursor is changed by aui on macOS.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#25813)Oh, I had somehow assumed that the cursor was set via SetCursor() but this is not the case here, it's set implicitly by processing wxEVT_SET_CURSOR and the code for handling this is in a different place.
Moreover, I'm much less sure about what returning a null cursor from this event handler supposed to mean. It seems that doing this is actually illegal, at least this is what the documentation for wxSetCursorEvent::HasCursor() implies. So maybe the correct fix is actually this:
diff --git a/src/aui/framemanager.cpp b/src/aui/framemanager.cpp index 0b368b7110..148495a1cb 100644 --- a/src/aui/framemanager.cpp +++ b/src/aui/framemanager.cpp @@ -3979,6 +3979,9 @@ void wxAuiManager::OnFindManager(wxAuiManagerEvent& evt) void wxAuiManager::OnSetCursor(wxSetCursorEvent& event) { + // Don't set any cursor by default. + event.Skip(); + // determine cursor wxAuiDockUIPart* part = HitTest(event.GetX(), event.GetY()); wxCursor cursor; @@ -4010,7 +4013,13 @@ void wxAuiManager::OnSetCursor(wxSetCursorEvent& event) } } - event.SetCursor(cursor); + if ( cursor.IsOk() ) + { + event.SetCursor(cursor); + + // Undo Skip() done above. + event.Skip(false); + } }
Does this work for you?
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
Tommy Krul
Tommykrul left a comment (wxWidgets/wxWidgets#25813)I tried this change and this does indeed fix the issue I was seeing on macOS
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
Closed #25813.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.
VZ
vadz left a comment (wxWidgets/wxWidgets#25813)Thanks for testing, I'm closing this one then and will push this change to fix the bug soon.
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you are subscribed to this thread.