-
Notifications
You must be signed in to change notification settings - Fork 90
macos/patches: Backport QT macOS docking fixes #102
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
|
Do we not need the third patch that amends the second patch? See: |
RytoEX
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Commit message nit: QT -> Qt
We don't set a custom title bar widget anywhere, which according to the commit message is the only thing that behaves differently with that patch (I'd assume any already floating docks with custom title bars freak out for some reason), so it isn't needed in our case. |
|
Fixed the commit message, I'll leave the decision on qt/qtbase@ba3e1fe to you, see my comment above. |
|
We can leave the third patch out if it's truly not needed. We can always land this now and add it later if we find a need. I'm honestly not entirely sure what cases/issues it fixes. On the other hand, it might be less annoying to just add it now so we don't have to re-release later should we find it useful. Thoughts @PatTheMav ? |
|
There is the potential of the omitted patch fixing other behaviour that later patches somehow rely on, but until that is confirmed I'm fine with it. |
We don't currently, but see obsproject/obs-studio#6358. I don't know if that will be merged, but I'm tempted to err on the side of caution and just include the third patch if that PR would be affected. I'm leaning towards just including the extra patch since it was tagged on the QTBUG, and I don't want to have to remember that we didn't include it if this somehow later comes up. Otherwise, this seems fine to me, so it will likely be merged one way or another. |
|
I also saw that PR, and with that in mind I also lean towards including the patch - I'll add it to this PR tomorrow or so |
|
Added the third patch. Edit: CI restored from cache. Are you kidding me? :D |
Yeah, the cache key is |
Backports 78b6050 and 3224c6d from qt/qtbase, fixing the broken macOS docking and undocking.
Description
Backports qt/qtbase@78b6050 and qt/qtbase@3224c6d, fixing the broken macOS
docking and undocking.
These fixes are documented to fix QTBUG-70137, where docks will freak out when getting dragged out of the UI; however they also happens to fix QTBUG-64483 (floating docks randomly deciding they lost their will to live, and no longer being re-dockable) (@RytoEX has been watching that one).
These two bugs were the biggest troublemakers in terms of docking and undocking on macOS.
The patches are no longer needed once we move to QT 6.2 (which is where they are from), but for now I think they are really important (and perhaps could even justify a macOS hotfix on their own).
Motivation and Context
Docking can get very broken on macOS.
This makes it better. Not perfect, but much better..
How Has This Been Tested?
Built on GHA and compiled my OBS against it.
Test QT artifacts here, so that you don't need to wait two hours for QT to compile.
Types of changes
Checklist: