Skip to content

StyleManager: fix interaction with automatic accent color #2441

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

Merged
merged 3 commits into from
Jun 13, 2025
Merged

StyleManager: fix interaction with automatic accent color #2441

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0c949e7
StyleManager: follow automatic accent color
lenemter Jun 11, 2025
76629d9
Fix lint
lenemter Jun 11, 2025
28442ca
Merge branch 'main' into lenemter/use-real-accent-color
leonardo-lemos Jun 13, 2025
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
38 changes: 27 additions & 11 deletions lib/Drawing/StyleManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,16 @@ public class Gala.Drawing.StyleManager : Object {
}

[DBus (name="io.elementary.pantheon.AccountsService")]
private interface AccountsService : DBusProxy {
private interface PantheonAccountsService : DBusProxy {
public abstract int prefers_color_scheme { get; set; }
public abstract int prefers_accent_color { get; set; }
}

[DBus (name="io.elementary.SettingsDaemon.AccountsService")]
private interface SettingsDaemonAccountsService : DBusProxy {
public abstract int accent_color { get; set; }
}

private const string FDO_ACCOUNTS_NAME = "org.freedesktop.Accounts";
private const string FDO_ACCOUNTS_PATH = "/org/freedesktop/Accounts";

Expand All @@ -37,10 +42,18 @@ public class Gala.Drawing.StyleManager : Object {
public ColorScheme prefers_color_scheme { get; private set; default = LIGHT; }
public Gdk.RGBA theme_accent_color { get; private set; default = DEFAULT_ACCENT_COLOR; }

private AccountsService? accounts_service_proxy;
private PantheonAccountsService? pantheon_proxy;
private SettingsDaemonAccountsService? settings_daemon_proxy;

construct {
Bus.watch_name (SYSTEM, FDO_ACCOUNTS_NAME, NONE, () => connect_to_accounts_service.begin (), () => accounts_service_proxy = null);
Bus.watch_name (
SYSTEM, FDO_ACCOUNTS_NAME, NONE,
() => connect_to_accounts_service.begin (),
() => {
pantheon_proxy = null;
settings_daemon_proxy = null;
}
);
}

private async void connect_to_accounts_service () {
Expand All @@ -49,24 +62,27 @@ public class Gala.Drawing.StyleManager : Object {

var path = yield accounts.find_user_by_name (Environment.get_user_name ());

accounts_service_proxy = yield Bus.get_proxy<AccountsService> (SYSTEM, FDO_ACCOUNTS_NAME, path, GET_INVALIDATED_PROPERTIES);
pantheon_proxy = yield Bus.get_proxy<PantheonAccountsService> (SYSTEM, FDO_ACCOUNTS_NAME, path, GET_INVALIDATED_PROPERTIES);
settings_daemon_proxy = yield Bus.get_proxy<SettingsDaemonAccountsService> (SYSTEM, FDO_ACCOUNTS_NAME, path, GET_INVALIDATED_PROPERTIES);
} catch {
warning ("Could not connect to AccountsService. Default accent color will be used");
return;
}

update_color_scheme (accounts_service_proxy.prefers_color_scheme);
update_color (accounts_service_proxy.prefers_accent_color);
update_color_scheme (pantheon_proxy.prefers_color_scheme);
update_color (settings_daemon_proxy.accent_color);

accounts_service_proxy.g_properties_changed.connect ((changed, invalid) => {
var value = changed.lookup_value ("PrefersAccentColor", new VariantType ("i"));
pantheon_proxy.g_properties_changed.connect ((changed, invalid) => {
var value = changed.lookup_value ("PrefersColorScheme", new VariantType ("i"));
if (value != null) {
update_color (value.get_int32 ());
update_color_scheme (value.get_int32 ());
}
});

value = changed.lookup_value ("PrefersColorScheme", new VariantType ("i"));
settings_daemon_proxy.g_properties_changed.connect ((changed, invalid) => {
var value = changed.lookup_value ("AccentColor", new VariantType ("i"));
if (value != null) {
update_color_scheme (value.get_int32 ());
update_color (value.get_int32 ());
}
});
}
Expand Down