-
-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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
qt: add adwaita platform theme #5156
qt: add adwaita platform theme #5156
Conversation
One reason I did not do this before is because those are all breaking changes, and there is no way to do this in a way that we could inform the users (e.g.: So I am not sure about those changes. This will probably generate difficult to debug errors for the users. |
303beb4
to
221e2e3
Compare
Added backwards compatibility with the following warning: $ nix develop --ignore-environment .#qt-platform-theme-gnome
trace: warning: The option `qt.platformTheme` has been renamed to `qt.platformTheme.name`.
trace: warning: The value `gnome` for option `qt.platformTheme` is deprecated. Use `adwaita` instead.
bash: warning: setlocale: LC_NUMERIC: cannot change locale (de_CH.UTF-8): No such file or directory
bash: warning: setlocale: LC_TIME: cannot change locale (de_CH.UTF-8): No such file or directory
qt-platform-theme-gnome: OK I think that should be enough for users to know what to do. |
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.
LGTM, thanks for the backwards compatibility changes.
21eee62
to
7aab777
Compare
@rycee @andresilva your comments should be resolved. You can rereview the code. |
Co-authored-by: André Silva <123550+andresilva@users.noreply.github.com>
fd612a8
to
7579929
Compare
7579929
to
54e35e0
Compare
Thanks! Merged to master now 🙂 |
It seems my QT theme breaks after the update, and it's mixing the light theme and dark theme together. I guess this PR may be relevant. Either using the original The items are interleaving dark and light theme. (The grey box is just for redacted texts.) My previously working configuration is here. |
The README of QAdwaitaDecorations says that it is a "Qt decoration plugin", not a platform theme and that it should be applied by setting the QT_WAYLAND_DECORATION environment variable. I don't know much about Qt, but it seems to me like it doesn't make much sense to try to set QAdwaitaDecorations as a platform theme. |
Description
This PR adds
adwaita
as an option toqt.platformTheme
fixing #4702 and also NixOS/nixpkgs#295345 (thegnome
option breaks some Qt6 tray applications). It also extends the configuraton interface to matchqt.style
which has aname
andpackage
sub-option for edge cases.Checklist
Change is backwards compatible.
Code formatted with
./format
.Code tested through
nix-shell --pure tests -A run.all
ornix develop --ignore-environment .#all
using Flakes.Test cases updated/added. See example.
Commit messages are formatted like
See CONTRIBUTING for more information and recent commit messages for examples.
If this PR adds a new module
Maintainer CC
@rycee @thiagokokada