Make elementary themes the default fallback #30
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| diff --git a/gtk/gtksettingsprivate.h b/gtk/gtksettingsprivate.h | ||
| index 47f75a6297..fd822c630a 100644 | ||
| --- a/gtk/gtksettingsprivate.h | ||
| +++ b/gtk/gtksettingsprivate.h | ||
| @@ -23,8 +23,8 @@ | ||
|
|
||
| G_BEGIN_DECLS | ||
|
|
||
| -#define DEFAULT_THEME_NAME "Adwaita" | ||
| -#define DEFAULT_ICON_THEME "Adwaita" | ||
| +#define DEFAULT_THEME_NAME "io.elementary.stylesheet.blueberry" | ||
| +#define DEFAULT_ICON_THEME "elementary" | ||
|
|
||
| void _gtk_settings_set_property_value_from_rc (GtkSettings *settings, | ||
| const gchar *name, | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,6 +45,32 @@ | |
| } | ||
| }, | ||
| "modules": [ | ||
| { | ||
| "name": "gtk", | ||
|
There was a problem hiding this comment. Not sure exactly what's going on but when trying to build locally it fails like this: There was a problem hiding this comment. @alatiera I guess this is rofiles-fuse preventing modifications to already-existing file. One way to fix this would be adding the path to "ensure-writable": [
"/lib/x86_64-linux-gnu/gtk-3.0/3.0.0/immodules.cache"
]Or just running |
||
| "buildsystem": "meson", | ||
| "config-opts": [ | ||
| "-Dbroadway_backend=true", | ||
| "-Dinstalled_tests=true", | ||
|
There was a problem hiding this comment. we don't need the tests in the runtime There was a problem hiding this comment. I took the options from https://gitlab.gnome.org/GNOME/gnome-build-meta/-/blob/master/elements/sdk/gtk+-3.bst There was a problem hiding this comment. Yes, gnome-build-meta acts as project wide CI too so we want to make sure they are built there. We filter the produced binaries out from the runtime afterwards. |
||
| "-Dtests=false", | ||
| "-Dx11_backend=true", | ||
| "-Dwayland-backend=true", | ||
| "-Dgtk_doc=true", | ||
| "-Dman=true", | ||
| "-Dintrospection=true", | ||
| "-Dtracker3=true" | ||
| ], | ||
| "sources": [ | ||
| { | ||
| "type": "git", | ||
| "url": "https://gitlab.gnome.org/GNOME/gtk.git", | ||
| "tag": "3.24.28" | ||
| }, | ||
| { | ||
| "type": "patch", | ||
| "path": "gtk-default-themes.patch" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "name": "icons", | ||
| "buildsystem": "meson", | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
i don't think there's a non-intentional way to use the icon fallback on flatpak, the host icons folder is mounted on the sandbox, so the selected theme is always found.
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.
I mean, given the fact Dippi for instance automatically overrides even the icon theme, I wonder if Dippi's strategy can be incorporated directly into the platform.