Skip to content

Appearance: use stateful action for radios #444

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
danirabbit merged 2 commits into from
May 6, 2025
Merged

Appearance: use stateful action for radios #444

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2126ee9
Appearance: use stateful action for radios
danirabbit Apr 9, 2025
20450ae
Merge branch 'main' into danirabbit/appearance-stateful-action
jeremypw Apr 20, 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
169 changes: 72 additions & 97 deletions src/Views/Appearance.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ public class PantheonShell.Appearance : Switchboard.SettingsPage {
construct {
var default_preview = new DesktopPreview ("default");

var prefer_default_radio = new Gtk.CheckButton ();
var prefer_default_radio = new Gtk.CheckButton () {
action_name = "desktop-appearance.prefers-color-scheme",
action_target = new Variant.int32 (Granite.Settings.ColorScheme.NO_PREFERENCE)
};
prefer_default_radio.add_css_class ("image-button");

var prefer_default_grid = new Gtk.Grid ();
Expand All @@ -87,6 +90,8 @@ public class PantheonShell.Appearance : Switchboard.SettingsPage {
var dark_preview = new DesktopPreview ("dark");

var prefer_dark_radio = new Gtk.CheckButton () {
action_name = "desktop-appearance.prefers-color-scheme",
action_target = new Variant.int32 (Granite.Settings.ColorScheme.DARK),
group = prefer_default_radio
};
prefer_dark_radio.add_css_class ("image-button");
Expand Down Expand Up @@ -198,15 +203,6 @@ public class PantheonShell.Appearance : Switchboard.SettingsPage {
grid.attach (schedule_label, 0, 4, 2);
grid.attach (schedule_box, 0, 5, 2);

switch (pantheon_act.prefers_color_scheme) {
case Granite.Settings.ColorScheme.DARK:
prefer_dark_radio.active = true;
break;
default:
prefer_default_radio.active = true;
break;
}

var settings = new GLib.Settings ("io.elementary.settings-daemon.prefers-color-scheme");

settings.bind_with_mapping (
Expand Down Expand Up @@ -257,55 +253,6 @@ public class PantheonShell.Appearance : Switchboard.SettingsPage {
null, null
);

prefer_default_radio.toggled.connect (() => {
pantheon_act.prefers_color_scheme = Granite.Settings.ColorScheme.NO_PREFERENCE;

var mutter_settings = new GLib.Settings ("org.gnome.desktop.interface");
mutter_settings.set_enum ("color-scheme", Granite.Settings.ColorScheme.NO_PREFERENCE);
});

prefer_dark_radio.toggled.connect (() => {
pantheon_act.prefers_color_scheme = Granite.Settings.ColorScheme.DARK;

var mutter_settings = new GLib.Settings ("org.gnome.desktop.interface");
mutter_settings.set_enum ("color-scheme", Granite.Settings.ColorScheme.DARK);
});

/* Connect to focus_in_event so that this is only triggered
* through user interaction, not if scheduling changes the selection
*/
var prefer_default_radio_controller = new Gtk.EventControllerFocus ();
prefer_default_radio.add_controller (prefer_default_radio_controller);
prefer_default_radio_controller.enter.connect (() => {
// Check if selection changed
if (pantheon_act.prefers_color_scheme != Granite.Settings.ColorScheme.NO_PREFERENCE) {
schedule_disabled_radio.active = true;
}
});

var prefer_dark_radio_controller = new Gtk.EventControllerFocus ();
prefer_dark_radio.add_controller (prefer_dark_radio_controller);
prefer_dark_radio_controller.enter.connect (() => {
// Check if selection changed
if (pantheon_act.prefers_color_scheme != Granite.Settings.ColorScheme.DARK) {
schedule_disabled_radio.active = true;
}
});

((GLib.DBusProxy) pantheon_act).g_properties_changed.connect ((changed, invalid) => {
var color_scheme = changed.lookup_value ("PrefersColorScheme", new VariantType ("i"));
if (color_scheme != null) {
switch ((Granite.Settings.ColorScheme) color_scheme.get_int32 ()) {
case Granite.Settings.ColorScheme.DARK:
prefer_dark_radio.active = true;
break;
default:
prefer_default_radio.active = true;
break;
}
}
});

from_time.time = double_date_time (settings.get_double ("prefer-dark-schedule-from"));
from_time.time_changed.connect (() => {
settings.set_double ("prefer-dark-schedule-from", date_time_double (from_time.time));
Expand All @@ -324,37 +271,37 @@ public class PantheonShell.Appearance : Switchboard.SettingsPage {
debug ("Current stylesheet: %s", current_stylesheet);

if (current_stylesheet.has_prefix (STYLESHEET_PREFIX)) {
var blueberry_button = new PrefersAccentColorButton (pantheon_act, AccentColor.BLUE);
var blueberry_button = new PrefersAccentColorButton (AccentColor.BLUE);
blueberry_button.tooltip_text = _("Blueberry");

var mint_button = new PrefersAccentColorButton (pantheon_act, AccentColor.MINT, blueberry_button);
var mint_button = new PrefersAccentColorButton (AccentColor.MINT, blueberry_button);
mint_button.tooltip_text = _("Mint");

var lime_button = new PrefersAccentColorButton (pantheon_act, AccentColor.GREEN, blueberry_button);
var lime_button = new PrefersAccentColorButton (AccentColor.GREEN, blueberry_button);
lime_button.tooltip_text = _("Lime");

var banana_button = new PrefersAccentColorButton (pantheon_act, AccentColor.YELLOW, blueberry_button);
var banana_button = new PrefersAccentColorButton (AccentColor.YELLOW, blueberry_button);
banana_button.tooltip_text = _("Banana");

var orange_button = new PrefersAccentColorButton (pantheon_act, AccentColor.ORANGE, blueberry_button);
var orange_button = new PrefersAccentColorButton (AccentColor.ORANGE, blueberry_button);
orange_button.tooltip_text = _("Orange");

var strawberry_button = new PrefersAccentColorButton (pantheon_act, AccentColor.RED, blueberry_button);
var strawberry_button = new PrefersAccentColorButton (AccentColor.RED, blueberry_button);
strawberry_button.tooltip_text = _("Strawberry");

var bubblegum_button = new PrefersAccentColorButton (pantheon_act, AccentColor.PINK, blueberry_button);
var bubblegum_button = new PrefersAccentColorButton (AccentColor.PINK, blueberry_button);
bubblegum_button.tooltip_text = _("Bubblegum");

var grape_button = new PrefersAccentColorButton (pantheon_act, AccentColor.PURPLE, blueberry_button);
var grape_button = new PrefersAccentColorButton (AccentColor.PURPLE, blueberry_button);
grape_button.tooltip_text = _("Grape");

var cocoa_button = new PrefersAccentColorButton (pantheon_act, AccentColor.BROWN, blueberry_button);
var cocoa_button = new PrefersAccentColorButton (AccentColor.BROWN, blueberry_button);
cocoa_button.tooltip_text = _("Cocoa");

var slate_button = new PrefersAccentColorButton (pantheon_act, AccentColor.GRAY, blueberry_button);
var slate_button = new PrefersAccentColorButton (AccentColor.GRAY, blueberry_button);
slate_button.tooltip_text = _("Slate");

var auto_button = new PrefersAccentColorButton (pantheon_act, AccentColor.NO_PREFERENCE, blueberry_button);
var auto_button = new PrefersAccentColorButton (AccentColor.NO_PREFERENCE, blueberry_button);
auto_button.tooltip_text = _("Automatic based on wallpaper");

var accent_box = new Gtk.Box (HORIZONTAL, 6) {
Expand Down Expand Up @@ -431,48 +378,76 @@ public class PantheonShell.Appearance : Switchboard.SettingsPage {

var background_settings = new GLib.Settings ("io.elementary.desktop.background");
background_settings.bind ("dim-wallpaper-in-dark-style", dim_switch, "active", DEFAULT);

var accent_color_action = new SimpleAction.stateful ("prefers-accent-color", GLib.VariantType.INT32, new Variant.int32 (AccentColor.NO_PREFERENCE));
var color_scheme_action = new SimpleAction.stateful ("prefers-color-scheme", GLib.VariantType.INT32, new Variant.int32 (Granite.Settings.ColorScheme.NO_PREFERENCE));

var action_group = new SimpleActionGroup ();
action_group.add_action (accent_color_action);
action_group.add_action (color_scheme_action);

insert_action_group ("desktop-appearance", action_group);

if (pantheon_act != null) {
accent_color_action.set_state (new Variant.int32 (pantheon_act.prefers_accent_color));
color_scheme_action.set_state (new Variant.int32 (pantheon_act.prefers_color_scheme));

((DBusProxy) pantheon_act).g_properties_changed.connect ((changed, invalid) => {
var accent_color = changed.lookup_value ("PrefersAccentColor", new VariantType ("i"));
if (accent_color != null && !accent_color_action.get_state ().equal (accent_color)) {
accent_color_action.set_state (accent_color);
}

var color_scheme = changed.lookup_value ("PrefersColorScheme", new VariantType ("i"));
if (color_scheme != null && !color_scheme_action.get_state ().equal (color_scheme)) {
color_scheme_action.set_state (color_scheme);
}
});

accent_color_action.activate.connect ((value) => {
if (!accent_color_action.get_state ().equal (value)) {
accent_color_action.set_state (value);
pantheon_act.prefers_accent_color = value.get_int32 ();

if (value != AccentColor.NO_PREFERENCE) {
interface_settings.set_string (
STYLESHEET_KEY,
STYLESHEET_PREFIX + ((AccentColor) value).to_string ()
);
}
}
});

color_scheme_action.activate.connect ((value) => {
if (!color_scheme_action.get_state ().equal (value)) {
color_scheme_action.set_state (value);
pantheon_act.prefers_color_scheme = value.get_int32 ();

var mutter_settings = new GLib.Settings ("org.gnome.desktop.interface");
mutter_settings.set_enum ("color-scheme", (Granite.Settings.ColorScheme) value.get_int32 ());

schedule_disabled_radio.active = true;
}
});
}
}

private class PrefersAccentColorButton : Gtk.CheckButton {
public AccentColor color { get; construct; }
public Pantheon.AccountsService? pantheon_act { get; construct; default = null; }

private static GLib.Settings interface_settings;

public PrefersAccentColorButton (Pantheon.AccountsService? pantheon_act, AccentColor color, Gtk.CheckButton? group_member = null) {
public PrefersAccentColorButton (AccentColor color, Gtk.CheckButton? group_member = null) {
Object (
pantheon_act: pantheon_act,
color: color,
group: group_member
);
}

static construct {
interface_settings = new GLib.Settings (INTERFACE_SCHEMA);

var current_stylesheet = interface_settings.get_string (STYLESHEET_KEY);
}

construct {
add_css_class (Granite.STYLE_CLASS_COLOR_BUTTON);
add_css_class (color.to_string ());

realize.connect (() => {
active = color == pantheon_act.prefers_accent_color;

toggled.connect (() => {
if (color != AccentColor.NO_PREFERENCE) {
interface_settings.set_string (
STYLESHEET_KEY,
STYLESHEET_PREFIX + color.to_string ()
);
}

if (((GLib.DBusProxy) pantheon_act).get_cached_property ("PrefersAccentColor") != null) {
pantheon_act.prefers_accent_color = color;
}
});
});
action_name = "desktop-appearance.prefers-accent-color";
action_target = new Variant.int32 (color);
}
}

Expand Down