Skip to content

fix(style): load user themes above the built-in base #18

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.

Sign up for GitHub

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

Open
perlowja wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(style): load user themes above the built-in base #18

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/style/style_manager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1254,10 +1254,9 @@ namespace Singularity.Style {
* Loads a user-provided Singularity theme by name.
*
* Searches standard theme directories for a directory named
* `theme_name` containing `singularity/style.css`. The CSS is loaded
* at priority 605 (above the built-in base at 600). If the theme also
* provides `singularity/style-light.css` it will be swapped in/out when
* apply_color_scheme is called.
* `theme_name` containing `singularity/style.css`, loaded at USER + 3
* (its `singularity/style-light.css` variant at USER + 4) above the
* built-in base at USER, so a theme can override base named colours.
*
* Pass an empty string to unload any previously loaded user theme and
* revert to the built-in default look.
Expand Down Expand Up @@ -1295,7 +1294,7 @@ namespace Singularity.Style {
StyleContext.add_provider_for_display(
Gdk.Display.get_default(),
user_theme_provider,
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION + 5
Gtk.STYLE_PROVIDER_PRIORITY_USER + 3
);
} catch (Error e) {
warning("StyleManager: failed to load user theme '%s': %s", theme_name, e.message);
Expand Down Expand Up @@ -1326,7 +1325,7 @@ namespace Singularity.Style {
StyleContext.add_provider_for_display(
Gdk.Display.get_default(),
user_theme_variant_provider,
Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION + 6
Gtk.STYLE_PROVIDER_PRIORITY_USER + 4
);
} catch (Error e) {
warning("StyleManager: failed to load user theme variant: %s", e.message);
Expand Down
Loading