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
Un-set unified title and tool bar on mac (Qt property) #5533
Conversation
Codecov Report
@@ Coverage Diff @@
## main #5533 +/- ##
=======================================
Coverage 89.36% 89.37%
=======================================
Files 608 608
Lines 51097 51096 -1
=======================================
+ Hits 45664 45667 +3
+ Misses 5433 5429 -4
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
4a58305
to
9924f65
Compare
For me this works perfectly and it's quite simple. One thing that makes this better is that the background when undocking is set by the napari theme and not OS theme. Now, I prefer to have napari and OS synced, but if you don't and you try to undock a widget it will look horrible. The other PR does not fix that on my end with pyside6. Maybe @dalthviz has some insight, as original qss 🧙♂️ ? |
Yeah this is what I set out to fix with this one. I can go either way about including the changes from the other PR in addition. They still make sense to me, but I think with this change they're not strictly necessary. I'll happily defer to the resident Qt experts! |
We do have minreq in our tox matrix, so we should be good on that front :) |
Maybe for an older Qt5 version like 5.6 or 5.9 or older MacOS versions was necessary to set that property for some reason? I think this solution makes sense 👍 (it's always nice to find a one liner solution for multiple problems and even better if it is done by removing code :) ) |
Man these tests failing pyqt5/python 3.8 are a bummer :( |
this is not a problem with python 3.8 I observed it also on other python version. |
Based on the above approvals and the comment from @dalthviz I think this is ready to merge. |
* main: (38 commits) Fix `test_worker_with_progress` by wait on worker end (napari#5548) Un-set unified title and tool bar on mac (Qt property) (napari#5533) Set PYTHONEXECUTABLE as part of macos fixes on (re)startup (napari#5531) Fix key error issue of action manager (napari#5539) Clean dangling widget in test (napari#5544) Use pytest-pretty for better log readability (napari#5525) Update vendoring tool to check on matplotlib colormap (napari#5181) MAINT: add time limit for CI. (napari#5495) Add show_debug notification (napari#5101) Overlays 2.0 (napari#4894) Clarify layer's editable property and separate interaction with visible property (napari#5413) ci(dependabot): bump docker/build-push-action from 3 to 4 (napari#5523) Fix opening file dialogs in PySide (napari#5492) [pre-commit.ci] pre-commit autoupdate (napari#5518) Replace flake8, isort and pyupgrade by ruff, enable additional usefull rules (napari#5513) MAINT: Don't format logs in log call (napari#5504) Fix conda avaliability check (napari#5496) Handle case when QtDims play thread is partially deleted (napari#5499) Bugfix: Add missing Enums and Flags required by PySide6 > 6.4 (napari#5480) Refactor Main Window status bar to improve information presentation (napari#5451) ...
# Description This one is a bit weird, but here goes. This fixes the background "behind" the QtViewerDockWidgets being the wrong color (something from the system theme). I think this was actually the root cause of the issues seen in #5529 and addressed separately in #5526. I could go either way then on whether to include the changes in #5526 as well. Anyway this removes a property that was set to fix an intermittent problem quite a while ago. It seems the behavior of this property actually changed in Qt5, and it is supposedly not compatible with windows that contain Open GL content. ### Before this change ![Screenshot 2023-02-06 at 12 12 18 PM](https://user-images.githubusercontent.com/1231828/217045566-eb330839-4496-4cb4-883e-2f58788ef68a.png) ### After this change ![Screenshot 2023-02-06 at 12 24 58 PM](https://user-images.githubusercontent.com/1231828/217045560-0d593d26-9cea-48ee-8838-864b8ef265fb.png) ## Type of change - [x] Bug-fix (non-breaking change which fixes an issue) # References #245 #239 #5529 #5526 # How has this been tested? - [x] I checked my changes work with both PySide and PyQt backends on Qt6, and PyQt on Qt5 ## Final checklist: - [x] My PR is the minimum possible work for the desired functionality Co-authored-by: Peter Sobolewski <76622105+psobolewskiPhD@users.noreply.github.com>
# Description This one is a bit weird, but here goes. This fixes the background "behind" the QtViewerDockWidgets being the wrong color (something from the system theme). I think this was actually the root cause of the issues seen in #5529 and addressed separately in #5526. I could go either way then on whether to include the changes in #5526 as well. Anyway this removes a property that was set to fix an intermittent problem quite a while ago. It seems the behavior of this property actually changed in Qt5, and it is supposedly not compatible with windows that contain Open GL content. ### Before this change ![Screenshot 2023-02-06 at 12 12 18 PM](https://user-images.githubusercontent.com/1231828/217045566-eb330839-4496-4cb4-883e-2f58788ef68a.png) ### After this change ![Screenshot 2023-02-06 at 12 24 58 PM](https://user-images.githubusercontent.com/1231828/217045560-0d593d26-9cea-48ee-8838-864b8ef265fb.png) ## Type of change - [x] Bug-fix (non-breaking change which fixes an issue) # References #245 #239 #5529 #5526 # How has this been tested? - [x] I checked my changes work with both PySide and PyQt backends on Qt6, and PyQt on Qt5 ## Final checklist: - [x] My PR is the minimum possible work for the desired functionality Co-authored-by: Peter Sobolewski <76622105+psobolewskiPhD@users.noreply.github.com>
# Description This one is a bit weird, but here goes. This fixes the background "behind" the QtViewerDockWidgets being the wrong color (something from the system theme). I think this was actually the root cause of the issues seen in #5529 and addressed separately in #5526. I could go either way then on whether to include the changes in #5526 as well. Anyway this removes a property that was set to fix an intermittent problem quite a while ago. It seems the behavior of this property actually changed in Qt5, and it is supposedly not compatible with windows that contain Open GL content. ### Before this change ![Screenshot 2023-02-06 at 12 12 18 PM](https://user-images.githubusercontent.com/1231828/217045566-eb330839-4496-4cb4-883e-2f58788ef68a.png) ### After this change ![Screenshot 2023-02-06 at 12 24 58 PM](https://user-images.githubusercontent.com/1231828/217045560-0d593d26-9cea-48ee-8838-864b8ef265fb.png) ## Type of change - [x] Bug-fix (non-breaking change which fixes an issue) # References #245 #239 #5529 #5526 # How has this been tested? - [x] I checked my changes work with both PySide and PyQt backends on Qt6, and PyQt on Qt5 ## Final checklist: - [x] My PR is the minimum possible work for the desired functionality Co-authored-by: Peter Sobolewski <76622105+psobolewskiPhD@users.noreply.github.com>
# Description This one is a bit weird, but here goes. This fixes the background "behind" the QtViewerDockWidgets being the wrong color (something from the system theme). I think this was actually the root cause of the issues seen in #5529 and addressed separately in #5526. I could go either way then on whether to include the changes in #5526 as well. Anyway this removes a property that was set to fix an intermittent problem quite a while ago. It seems the behavior of this property actually changed in Qt5, and it is supposedly not compatible with windows that contain Open GL content. ### Before this change ![Screenshot 2023-02-06 at 12 12 18 PM](https://user-images.githubusercontent.com/1231828/217045566-eb330839-4496-4cb4-883e-2f58788ef68a.png) ### After this change ![Screenshot 2023-02-06 at 12 24 58 PM](https://user-images.githubusercontent.com/1231828/217045560-0d593d26-9cea-48ee-8838-864b8ef265fb.png) ## Type of change - [x] Bug-fix (non-breaking change which fixes an issue) # References #245 #239 #5529 #5526 # How has this been tested? - [x] I checked my changes work with both PySide and PyQt backends on Qt6, and PyQt on Qt5 ## Final checklist: - [x] My PR is the minimum possible work for the desired functionality Co-authored-by: Peter Sobolewski <76622105+psobolewskiPhD@users.noreply.github.com>
# Description This one is a bit weird, but here goes. This fixes the background "behind" the QtViewerDockWidgets being the wrong color (something from the system theme). I think this was actually the root cause of the issues seen in #5529 and addressed separately in #5526. I could go either way then on whether to include the changes in #5526 as well. Anyway this removes a property that was set to fix an intermittent problem quite a while ago. It seems the behavior of this property actually changed in Qt5, and it is supposedly not compatible with windows that contain Open GL content. ### Before this change ![Screenshot 2023-02-06 at 12 12 18 PM](https://user-images.githubusercontent.com/1231828/217045566-eb330839-4496-4cb4-883e-2f58788ef68a.png) ### After this change ![Screenshot 2023-02-06 at 12 24 58 PM](https://user-images.githubusercontent.com/1231828/217045560-0d593d26-9cea-48ee-8838-864b8ef265fb.png) ## Type of change - [x] Bug-fix (non-breaking change which fixes an issue) # References #245 #239 #5529 #5526 # How has this been tested? - [x] I checked my changes work with both PySide and PyQt backends on Qt6, and PyQt on Qt5 ## Final checklist: - [x] My PR is the minimum possible work for the desired functionality Co-authored-by: Peter Sobolewski <76622105+psobolewskiPhD@users.noreply.github.com>
Description
This one is a bit weird, but here goes. This fixes the background "behind" the QtViewerDockWidgets being the wrong color (something from the system theme). I think this was actually the root cause of the issues seen in #5529 and addressed separately in #5526. I could go either way then on whether to include the changes in #5526 as well.
Anyway this removes a property that was set to fix an intermittent problem quite a while ago. It seems the behavior of this property actually changed in Qt5, and it is supposedly not compatible with windows that contain Open GL content.
Before this change
After this change
Type of change
References
#245
#239
#5529
#5526
How has this been tested?
Final checklist: