Skip to content

Commit 476a9fd

Browse files
authored
Application: hard code elementary styles (#497)
1 parent 0e20e05 commit 476a9fd

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

data/wingpanel.appdata.xml.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@
1010
<description>
1111
<p>The extensible top panel for Pantheon. Wingpanel is an empty container that accepts indicators as extensions, including the applications menu.</p>
1212
</description>
13+
1314
<releases>
1415
<release version="3.0.4" date="2023-18-25" urgency="medium">
1516
<description>
1617
<p>Improvements:</p>
1718
<ul>
19+
<li>Always use elementary visual resources</li>
1820
<li>Esc to close popovers</li>
1921
<li>Updated translations</li>
2022
</ul>
@@ -23,6 +25,7 @@
2325
<issue url="https://github.com/elementary/wingpanel/issues/106">Indicators re-animate when an icon is removed</issue>
2426
</issues>
2527
</release>
28+
2629
<release version="3.0.3" date="2022-10-17" urgency="medium">
2730
<description>
2831
<p>Improvements:</p>

src/Application.vala

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,16 @@ public class Wingpanel.Application : Gtk.Application {
8585

8686
var granite_settings = Granite.Settings.get_default ();
8787
var gtk_settings = Gtk.Settings.get_default ();
88+
gtk_settings.gtk_icon_theme_name = "elementary";
8889

89-
gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK;
90+
if (!gtk_settings.gtk_theme_name.has_prefix ("io.elementary")) {
91+
gtk_settings.gtk_theme_name = "io.elementary.stylesheet.blueberry";
92+
}
93+
94+
gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == DARK;
9095

9196
granite_settings.notify["prefers-color-scheme"].connect (() => {
92-
gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == Granite.Settings.ColorScheme.DARK;
97+
gtk_settings.gtk_application_prefer_dark_theme = granite_settings.prefers_color_scheme == DARK;
9398
});
9499
}
95100

0 commit comments

Comments
 (0)