From 96d1856a922468f1216d1c8ef5c63828b797e2bf Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Fri, 17 Jul 2026 13:50:10 +0300 Subject: [PATCH 01/21] DeviceManager: use gala's brightness interface --- src/Services/DBusInterfaces/Screen.vala | 4 ++-- src/Services/DeviceManager.vala | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Services/DBusInterfaces/Screen.vala b/src/Services/DBusInterfaces/Screen.vala index 102faee0..2a61fcac 100644 --- a/src/Services/DBusInterfaces/Screen.vala +++ b/src/Services/DBusInterfaces/Screen.vala @@ -18,8 +18,8 @@ */ namespace Power.Services.DBusInterfaces { - [DBus (name = "org.gnome.SettingsDaemon.Power.Screen")] - interface PowerSettings : GLib.Object { + [DBus (name = "io.elementary.gala.BrightnessManager")] + interface BrightnessManager : GLib.Object { public abstract int brightness { get; set; } } } diff --git a/src/Services/DeviceManager.vala b/src/Services/DeviceManager.vala index 7ce3eb8e..3af36262 100644 --- a/src/Services/DeviceManager.vala +++ b/src/Services/DeviceManager.vala @@ -21,13 +21,13 @@ public class Power.Services.DeviceManager : Object { private const string UPOWER_INTERFACE = "org.freedesktop.UPower"; private const string UPOWER_PATH = "/org/freedesktop/UPower"; - private const string POWER_SETTINGS_INTERFACE = "org.gnome.SettingsDaemon.Power"; - private const string POWER_SETTINGS_PATH = "/org/gnome/SettingsDaemon/Power"; + private const string GALA_INTERFACE = "io.elementary.gala"; + private const string GALA_PATH = "/io/elementary/gala/BrightnessManager"; private static DeviceManager? instance = null; private DBusInterfaces.UPower? upower = null; - private DBusInterfaces.PowerSettings? iscreen = null; + private DBusInterfaces.BrightnessManager? iscreen = null; public Services.Backlight backlight { get; construct; } public Gee.HashMap devices { get; private set; } @@ -92,8 +92,8 @@ public class Power.Services.DeviceManager : Object { iscreen = yield Bus.get_proxy ( BusType.SESSION, - POWER_SETTINGS_INTERFACE, - POWER_SETTINGS_PATH, + GALA_INTERFACE, + GALA_PATH, DBusProxyFlags.GET_INVALIDATED_PROPERTIES ); debug ("Connection to Power Settings bus established"); From 8a12a7ca874ac23fe5f5e51bc9ec4c54eeb89c8e Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Sun, 30 Aug 2026 18:19:28 +0300 Subject: [PATCH 02/21] Update for interface changes --- src/Indicator.vala | 6 +- .../{Screen.vala => BrightnessManager.vala} | 10 +- src/Services/DeviceManager.vala | 92 +++++++++++++------ src/Utils.vala | 8 +- src/Widgets/PopoverWidget.vala | 6 +- src/Widgets/ScreenBrightness.vala | 86 +++++++++++------ src/meson.build | 2 +- 7 files changed, 140 insertions(+), 70 deletions(-) rename src/Services/DBusInterfaces/{Screen.vala => BrightnessManager.vala} (57%) diff --git a/src/Indicator.vala b/src/Indicator.vala index 954d43a3..46fa5e88 100644 --- a/src/Indicator.vala +++ b/src/Indicator.vala @@ -87,7 +87,7 @@ public class Power.Indicator : Wingpanel.Indicator { }); display_widget.add_controller (scroll_controller); - dm.brightness_changed.connect (update_tooltip); + dm.monitor_brightness_changed.connect (update_tooltip); } } @@ -191,7 +191,7 @@ public class Power.Indicator : Wingpanel.Indicator { } if (primary_text == null && dm.backlight.present) { - primary_text = _("Screen brightness: %i").printf ((int)(dm.brightness)); + primary_text = _("Screen brightness: %i").printf ((int)(dm.get_monitor_brightness (0))); secondary_text = _("Scroll to change screen brightness"); } @@ -211,7 +211,7 @@ public class Power.Indicator : Wingpanel.Indicator { if (is_in_session) { var notification = new Notify.Notification ("indicator-power", "", "display-brightness-symbolic"); notification.set_hint ("x-canonical-private-synchronous", new Variant.string ("indicator-power")); - notification.set_hint ("value", new Variant.int32 (dm.brightness)); + notification.set_hint ("value", new Variant.int32 ((int) (dm.get_monitor_brightness (0) * 100))); try { notification.show (); return true; diff --git a/src/Services/DBusInterfaces/Screen.vala b/src/Services/DBusInterfaces/BrightnessManager.vala similarity index 57% rename from src/Services/DBusInterfaces/Screen.vala rename to src/Services/DBusInterfaces/BrightnessManager.vala index 2a61fcac..5bd2799e 100644 --- a/src/Services/DBusInterfaces/Screen.vala +++ b/src/Services/DBusInterfaces/BrightnessManager.vala @@ -20,6 +20,14 @@ namespace Power.Services.DBusInterfaces { [DBus (name = "io.elementary.gala.BrightnessManager")] interface BrightnessManager : GLib.Object { - public abstract int brightness { get; set; } + public signal void monitors_changed (); + public signal void monitor_brightness_changed (int index, double value); + + public abstract double get_global_brightness () throws GLib.IOError, GLib.DBusError; + public abstract double get_monitor_brightness (int index) throws GLib.IOError, GLib.DBusError; + public abstract string get_monitor_name (int index) throws GLib.IOError, GLib.DBusError; + public abstract int get_n_monitors () throws GLib.IOError, GLib.DBusError; + public abstract void set_global_brightness (double scale) throws GLib.IOError, GLib.DBusError; + public abstract void set_monitor_brightness (int index, double brightness) throws GLib.IOError, GLib.DBusError; } } diff --git a/src/Services/DeviceManager.vala b/src/Services/DeviceManager.vala index 3af36262..f705172b 100644 --- a/src/Services/DeviceManager.vala +++ b/src/Services/DeviceManager.vala @@ -27,7 +27,7 @@ public class Power.Services.DeviceManager : Object { private static DeviceManager? instance = null; private DBusInterfaces.UPower? upower = null; - private DBusInterfaces.BrightnessManager? iscreen = null; + private DBusInterfaces.BrightnessManager? brightness_manager = null; public Services.Backlight backlight { get; construct; } public Gee.HashMap devices { get; private set; } @@ -36,25 +36,12 @@ public class Power.Services.DeviceManager : Object { public bool has_battery { get; private set; } public bool on_battery { get; private set; } public bool on_low_battery { get; private set; } - public int brightness { - get { - if (backlight.present && iscreen != null) { - return iscreen.brightness; - } else { - return -1; - } - } - - set { - if (backlight.present && iscreen != null) { - iscreen.brightness = value.clamp (0, 100); - } - } - } public signal void battery_registered (string device_path, Device battery); public signal void battery_deregistered (string device_path); - public signal void brightness_changed (int brightness); + + public signal void monitors_changed (); + public signal void monitor_brightness_changed (int index, double value); construct { backlight = new Services.Backlight (); @@ -90,7 +77,7 @@ public class Power.Services.DeviceManager : Object { ); debug ("Connection to UPower bus established"); - iscreen = yield Bus.get_proxy ( + brightness_manager = yield Bus.get_proxy ( BusType.SESSION, GALA_INTERFACE, GALA_PATH, @@ -139,7 +126,7 @@ public class Power.Services.DeviceManager : Object { } } - private void connect_signals () requires (upower != null && iscreen != null) { + private void connect_signals () requires (upower != null && brightness_manager != null) { upower.g_properties_changed.connect (() => { update_properties (); update_batteries (); @@ -148,12 +135,8 @@ public class Power.Services.DeviceManager : Object { upower.DeviceAdded.connect (register_device); upower.DeviceRemoved.connect (deregister_device); - ((DBusProxy)iscreen).g_properties_changed.connect ((changed_properties, invalidated_properties) => { - var changed_brightness = changed_properties.lookup_value ("Brightness", new VariantType ("i")); - if (changed_brightness != null) { - brightness_changed (changed_brightness.get_int32 ()); - } - }); + brightness_manager.monitors_changed.connect (monitors_changed_cb); + brightness_manager.monitor_brightness_changed.connect (monitor_brightness_changed_cb); } private void update_properties () requires (upower != null) { @@ -200,9 +183,62 @@ public class Power.Services.DeviceManager : Object { } } - public void change_brightness (int change) { - if (iscreen != null) { - brightness = iscreen.brightness + change; + private void monitors_changed_cb () { + monitors_changed (); + } + + private void monitor_brightness_changed_cb (int index, double value) { + monitor_brightness_changed (index, value); + } + + public double get_monitor_brightness (int index) { + if (brightness_manager != null) { + try { + return brightness_manager.get_monitor_brightness (index); + } catch (Error e) { + warning ("Couldn't get monitor's brightness: %s", e.message); + } + } + return -1; + } + + public void set_monitor_brightness (int index, double value) { + if (brightness_manager != null) { + try { + brightness_manager.set_monitor_brightness (index, value); + } catch (Error e) { + warning ("Couldn't set monitor's brightness: %s", e.message); + } + } + } + + public string get_monitor_data (int index) { + if (brightness_manager != null) { + try { + return brightness_manager.get_monitor_name (index); + } catch (Error e) { + warning ("Couldn't get monitor's data: %s", e.message); + } + } + return ""; + } + + public int get_monitor_count () { + if (brightness_manager != null) { + try { + return brightness_manager.get_n_monitors (); + } catch (Error e) { + warning ("Couldn't get monitor's count: %s", e.message); + } + } + return 0; + } + + public void change_global_brightness (double change) { + try { + brightness_manager.set_global_brightness ((brightness_manager.get_global_brightness () + change).clamp (0.0, 1.0)); + } catch (Error e) { + warning ("Couldn't set global brightness: %s", e.message); } } } diff --git a/src/Utils.vala b/src/Utils.vala index 3733a088..4fb9fb0f 100644 --- a/src/Utils.vala +++ b/src/Utils.vala @@ -1,6 +1,6 @@ public class Power.Utils { - private const double BRIGHTNESS_STEP = 5.0; + private const double BRIGHTNESS_STEP = 0.005; private static double total_y_delta = 0; private static double total_x_delta = 0; @@ -54,9 +54,9 @@ public class Power.Utils { break; } - if (total_y_delta.abs () * BRIGHTNESS_STEP > 1.0) { + if (total_y_delta.abs () * BRIGHTNESS_STEP > 0.001) { dir = natural_scroll ? total_y_delta : -total_y_delta; - } else if (total_x_delta.abs () * BRIGHTNESS_STEP > 1.0) { + } else if (total_x_delta.abs () * BRIGHTNESS_STEP > 0.001) { dir = natural_scroll ? -total_x_delta : total_x_delta; } @@ -64,7 +64,7 @@ public class Power.Utils { total_y_delta = 0.0; total_x_delta = 0.0; Power.Services.DeviceManager.get_default () - .change_brightness ((int) Math.round (dir * BRIGHTNESS_STEP)); + .change_global_brightness (dir * BRIGHTNESS_STEP); } return Gdk.EVENT_STOP; diff --git a/src/Widgets/PopoverWidget.vala b/src/Widgets/PopoverWidget.vala index 587c11be..8be9f9f7 100644 --- a/src/Widgets/PopoverWidget.vala +++ b/src/Widgets/PopoverWidget.vala @@ -58,7 +58,7 @@ public class Power.Widgets.PopoverWidget : Gtk.Box { }; var last_separator_revealer = new Gtk.Revealer () { - reveal_child = dm.brightness != -1, + reveal_child = dm.get_monitor_count () > 0, child = last_separator, }; @@ -137,8 +137,8 @@ public class Power.Widgets.PopoverWidget : Gtk.Box { } }); - dm.brightness_changed.connect ((brightness) => { - if (brightness != -1) { + dm.monitors_changed.connect (() => { + if (dm.get_monitor_count () > 0) { last_separator_revealer.reveal_child = true; } else { last_separator_revealer.reveal_child = false; diff --git a/src/Widgets/ScreenBrightness.vala b/src/Widgets/ScreenBrightness.vala index 8ea91f1a..19b4f528 100644 --- a/src/Widgets/ScreenBrightness.vala +++ b/src/Widgets/ScreenBrightness.vala @@ -18,8 +18,8 @@ */ public class Power.Widgets.ScreenBrightness : Granite.Bin { - private Gtk.Scale brightness_slider; private Power.Services.DeviceManager dm; + private Gtk.ListBox list_box; public bool natural_scroll_touchpad { get; set; } public bool natural_scroll_mouse { get; set; } @@ -32,54 +32,80 @@ public class Power.Widgets.ScreenBrightness : Granite.Bin { var touchpad_settings = new GLib.Settings ("org.gnome.desktop.peripherals.touchpad"); touchpad_settings.bind ("natural-scroll", this, "natural-scroll-touchpad", SettingsBindFlags.DEFAULT); + var scroll_controller = new Gtk.EventControllerScroll (BOTH_AXES); + scroll_controller.scroll.connect (on_scroll); + add_controller (scroll_controller); + + list_box = new Gtk.ListBox (); + child = list_box; + + populate_list (); + + dm.monitors_changed.connect (() => { + list_box.remove_all (); + populate_list (); + }); + } + + private void populate_list () { + for (int i = 0; i < dm.get_monitor_count (); i++) { + list_box.append (construct_row (i)); + } + } + + private Gtk.Widget construct_row (int index) { var image = new Gtk.Image.from_icon_name ("brightness-display-symbolic") { pixel_size = 48 }; - brightness_slider = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 100, 10) { - margin_end = 6, + var monitor_label = new Gtk.Label (dm.get_monitor_data (index)) { + halign = Gtk.Align.START + }; + + var brightness_slider = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 1, 0.1) { + margin_start = 2, + margin_end = 2, hexpand = true, draw_value = false, width_request = 175 }; - var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6) { + var slider_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 2) { hexpand = true, - margin_start = 6, - margin_end = 12 + vexpand = true, + homogeneous = true }; - box.append (image); - box.append (brightness_slider); + slider_box.append (monitor_label); + slider_box.append (brightness_slider); - var show_brightness_slider = new Gtk.Revealer () { - child = box + var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 4) { + hexpand = true, + margin_start = 6, + margin_end = 12 }; - child = show_brightness_slider; - - if (dm.brightness != -1) { - brightness_slider.set_value (dm.brightness); - show_brightness_slider.reveal_child = true; - } - - var scroll_controller = new Gtk.EventControllerScroll (BOTH_AXES); - scroll_controller.scroll.connect (on_scroll); - add_controller (scroll_controller); + box.append (image); + box.append (slider_box); - brightness_slider.value_changed.connect ((value) => { - brightness_slider.set_value (value.get_value ()); - dm.brightness = (int) value.get_value (); + ulong slider_signal = 0, dm_signal = 0; + slider_signal = brightness_slider.value_changed.connect ((value) => { + SignalHandler.block (dm, dm_signal); + dm.set_monitor_brightness (index, value.get_value ()); + SignalHandler.unblock (dm, dm_signal); }); - - dm.brightness_changed.connect ((brightness) => { - if (brightness != -1) { - brightness_slider.set_value ((double) brightness); - show_brightness_slider.reveal_child = true; - } else { - show_brightness_slider.reveal_child = false; + dm_signal = dm.monitor_brightness_changed.connect ((ch_index, value) => { + if (index != ch_index) { + return; } + + SignalHandler.block (brightness_slider, slider_signal); + brightness_slider.set_value (value); + SignalHandler.unblock (brightness_slider, slider_signal); }); + + brightness_slider.set_value (dm.get_monitor_brightness (index)); + return box; } private bool on_scroll (Gtk.EventControllerScroll controller, double dx, double dy) { diff --git a/src/meson.build b/src/meson.build index 40051eb4..7b074f87 100644 --- a/src/meson.build +++ b/src/meson.build @@ -15,9 +15,9 @@ files = files( 'Indicator.vala', 'Utils.vala', 'Services/Backlight/Backlight.vala', + 'Services/DBusInterfaces/BrightnessManager.vala', 'Services/DBusInterfaces/Device.vala', 'Services/DBusInterfaces/Properties.vala', - 'Services/DBusInterfaces/Screen.vala', 'Services/DBusInterfaces/UPower.vala', 'Services/DBusInterfaces/PowerProfile.vala', 'Services/Device.vala', From 3063d97e6611ac0fff068372b1ec2478ca3ba3b1 Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Sun, 6 Sep 2026 22:04:54 +0300 Subject: [PATCH 03/21] Adressing comments --- src/Indicator.vala | 59 ++++---- src/Services/Backlight/Backlight.vala | 48 ------- src/Services/BrightnessManager.vala | 128 ++++++++++++++++++ ...anager.vala => GalaBrightnessManager.vala} | 2 +- src/Services/DeviceManager.vala | 85 +----------- src/Utils.vala | 109 +++++++++------ src/Widgets/PopoverWidget.vala | 14 +- src/Widgets/ScreenBrightnessList.vala | 46 +++++++ ...ightness.vala => ScreenBrightnessRow.vala} | 70 ++++------ src/meson.build | 7 +- 10 files changed, 316 insertions(+), 252 deletions(-) delete mode 100644 src/Services/Backlight/Backlight.vala create mode 100644 src/Services/BrightnessManager.vala rename src/Services/DBusInterfaces/{BrightnessManager.vala => GalaBrightnessManager.vala} (96%) create mode 100644 src/Widgets/ScreenBrightnessList.vala rename src/Widgets/{ScreenBrightness.vala => ScreenBrightnessRow.vala} (52%) diff --git a/src/Indicator.vala b/src/Indicator.vala index 46fa5e88..35d4e028 100644 --- a/src/Indicator.vala +++ b/src/Indicator.vala @@ -30,6 +30,7 @@ public class Power.Indicator : Wingpanel.Indicator { private Services.Device? display_device = null; private Services.DeviceManager dm; + private Services.BrightnessManager brightness_manager; private Settings settings; @@ -46,6 +47,7 @@ public class Power.Indicator : Wingpanel.Indicator { Gtk.IconTheme.get_for_display (Gdk.Display.get_default ()).add_resource_path ("/io/elementary/panel/power"); dm = Power.Services.DeviceManager.get_default (); + brightness_manager = Services.BrightnessManager.get_default (); var mouse_settings = new GLib.Settings ("org.gnome.desktop.peripherals.mouse"); mouse_settings.bind ("natural-scroll", this, "natural-scroll-mouse", SettingsBindFlags.DEFAULT); @@ -60,35 +62,14 @@ public class Power.Indicator : Wingpanel.Indicator { display_widget = new Widgets.DisplayWidget (); /* No need to display the indicator when the device is completely in AC mode */ - if (dm.has_battery || dm.backlight.present) { + if (dm.has_battery || brightness_manager.present) { update_visibility (); } dm.notify["has-battery"].connect (update_visibility); dm.notify["display-device"].connect (update_display_device); settings.changed["show-percentage"].connect (update_tooltip); - - if (dm.backlight.present) { - var scroll_controller = new Gtk.EventControllerScroll (BOTH_AXES); - scroll_controller.scroll.connect ((controller, dx, dy) => { - if (Utils.handle_scroll_event ( - (Gdk.ScrollEvent) controller.get_current_event (), - natural_scroll_mouse, - natural_scroll_touchpad) - ) { - if (popover_widget == null || !popover_widget.is_visible ()) { - show_notification (); - } - - return true; - } - - return false; - }); - display_widget.add_controller (scroll_controller); - - dm.monitor_brightness_changed.connect (update_tooltip); - } + brightness_manager.connected.connect (update_scroll_controller); } return display_widget; @@ -111,7 +92,7 @@ public class Power.Indicator : Wingpanel.Indicator { private void update_visibility () { var dm = Services.DeviceManager.get_default (); - bool should_be_visible = (dm.has_battery || dm.backlight.present); + bool should_be_visible = (dm.has_battery || brightness_manager.present); if (visible != should_be_visible) { /* NOTE: popover closes every time you set visibility, so change property only when needed */ visible = should_be_visible; @@ -190,8 +171,8 @@ public class Power.Indicator : Wingpanel.Indicator { } } - if (primary_text == null && dm.backlight.present) { - primary_text = _("Screen brightness: %i").printf ((int)(dm.get_monitor_brightness (0))); + if (primary_text == null && brightness_manager.present) { + primary_text = _("Screen brightness: %i").printf ((int) (brightness_manager.get_global_brightness () * 100)); secondary_text = _("Scroll to change screen brightness"); } @@ -211,7 +192,7 @@ public class Power.Indicator : Wingpanel.Indicator { if (is_in_session) { var notification = new Notify.Notification ("indicator-power", "", "display-brightness-symbolic"); notification.set_hint ("x-canonical-private-synchronous", new Variant.string ("indicator-power")); - notification.set_hint ("value", new Variant.int32 ((int) (dm.get_monitor_brightness (0) * 100))); + notification.set_hint ("value", new Variant.int32 ((int) (brightness_manager.get_global_brightness () * 100))); try { notification.show (); return true; @@ -223,6 +204,30 @@ public class Power.Indicator : Wingpanel.Indicator { return false; } + + private void update_scroll_controller () { + if (brightness_manager.present) { + var scroll_controller = new Gtk.EventControllerScroll (BOTH_AXES); + scroll_controller.scroll.connect ((controller, dx, dy) => { + if (Utils.handle_global_scroll_event ( + (Gdk.ScrollEvent) controller.get_current_event (), + natural_scroll_mouse, + natural_scroll_touchpad) + ) { + if (popover_widget == null || !popover_widget.is_visible ()) { + show_notification (); + } + + return true; + } + + return false; + }); + display_widget.add_controller (scroll_controller); + + brightness_manager.monitor_brightness_changed.connect (update_tooltip); + } + } } public Wingpanel.Indicator get_indicator (Module module, Wingpanel.IndicatorManager.ServerType server_type) { diff --git a/src/Services/Backlight/Backlight.vala b/src/Services/Backlight/Backlight.vala deleted file mode 100644 index e7fe097e..00000000 --- a/src/Services/Backlight/Backlight.vala +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2011-2015 elementary LLC. (https://elementary.io) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -public class Power.Services.Backlight : GLib.Object { - - private const string BACKLIGHT_NAME = "backlight"; - - public bool present { get; construct set; } - - construct { - present = get_backlight_present (); - debug ("backlight present: %s", present.to_string ()); - } - - private static bool get_backlight_present () { - var context = new UDev.Context (); - var e = context.create_enumerate (); - e.add_match_subsystem (BACKLIGHT_NAME); - e.scan_devices (); - - for (unowned UDev.List d = e.entries; d != null; d = d.next) { - var path = d.name; - var dev = context.open_syspath (path); - - if (dev != null) { - return true; - } - } - - return false; - } -} diff --git a/src/Services/BrightnessManager.vala b/src/Services/BrightnessManager.vala new file mode 100644 index 00000000..c003f6ca --- /dev/null +++ b/src/Services/BrightnessManager.vala @@ -0,0 +1,128 @@ +/* + * Copyright 2026 elementary, Inc. (https://elementary.io) + * SPDX-License-Identifier: GPL-3.0-or-later + * + * Authored by: Denis Garaev + */ + +public class Power.Services.BrightnessManager : Object { + private const string GALA_INTERFACE = "io.elementary.gala"; + private const string GALA_PATH = "/io/elementary/gala/BrightnessManager"; + + public signal void connected (); + public signal void monitors_changed (); + public signal void monitor_brightness_changed (int index, double value); + + private Power.Services.DBusInterfaces.GalaBrightnessManager? gala_brightness_manager; + + private static BrightnessManager? instance = null; + + public bool present { + get { + if (gala_brightness_manager == null) { + return false; + } + + try { + if (gala_brightness_manager.get_n_monitors () == 0) { + return false; + } + } catch {} + + return true; + } + } + + construct { + init.begin ((obj, res) => { + try { + init.end (res); + connect_signals (); + } catch {} + }); + } + + public static Power.Services.BrightnessManager get_default () { + if (instance == null) { + instance = new BrightnessManager (); + } + + return instance; + } + + public int get_n_monitors () { + try { + return gala_brightness_manager.get_n_monitors (); + } catch (Error e) { + warning ("Couldn't get number of monitors: %s", e.message); + return -1; + } + } + + public double get_global_brightness () { + try { + return gala_brightness_manager.get_global_brightness ().clamp (0.0001, 1.0); + } catch (Error e) { + warning ("Couldn't get global brightness: %s", e.message); + return -1.0f; + } + } + + public void set_global_brightness (double value) { + try { + gala_brightness_manager.set_global_brightness (value.clamp (0.0001, 1.0)); + } catch (Error e) { + warning ("Coulnd't set global brightness: %s", e.message); + } + } + + public string get_monitor_name (int index) { + try { + return gala_brightness_manager.get_monitor_name (index); + } catch (Error e) { + warning ("Couldn't get %n monitor's name: %s", index, e.message); + return ""; + } + } + + public double get_monitor_brightness (int index) { + try { + return gala_brightness_manager.get_monitor_brightness (index).clamp (0.0001, 1); + } catch (Error e) { + warning ("Couldn't get %n monitor's brightness: %s", index, e.message); + return -1.0f; + } + } + + public void set_monitor_brightness (int index, double value) { + try { + gala_brightness_manager.set_monitor_brightness (index, value.clamp (0.0001, 1)); + } catch (Error e) { + warning ("Coulnd't set %n monitor's brightness: %s", index, e.message); + } + } + + + private async void init () throws Error { + try { + gala_brightness_manager = yield Bus.get_proxy (BusType.SESSION, GALA_INTERFACE, GALA_PATH); + connected (); + } catch (Error e) { + warning ("Couldn't connect to Gala's BrightnessManager: %s", e.message); + throw e; + } + } + + private void connect_signals () { + gala_brightness_manager.monitors_changed.connect (on_monitors_changed); + gala_brightness_manager.monitor_brightness_changed.connect (on_monitor_brightness_changed); + } + + private void on_monitors_changed () { + monitors_changed (); + } + + private void on_monitor_brightness_changed (int index, double value) { + monitor_brightness_changed (index, value); + } +} diff --git a/src/Services/DBusInterfaces/BrightnessManager.vala b/src/Services/DBusInterfaces/GalaBrightnessManager.vala similarity index 96% rename from src/Services/DBusInterfaces/BrightnessManager.vala rename to src/Services/DBusInterfaces/GalaBrightnessManager.vala index 5bd2799e..5d1c6229 100644 --- a/src/Services/DBusInterfaces/BrightnessManager.vala +++ b/src/Services/DBusInterfaces/GalaBrightnessManager.vala @@ -19,7 +19,7 @@ namespace Power.Services.DBusInterfaces { [DBus (name = "io.elementary.gala.BrightnessManager")] - interface BrightnessManager : GLib.Object { + interface GalaBrightnessManager : GLib.Object { public signal void monitors_changed (); public signal void monitor_brightness_changed (int index, double value); diff --git a/src/Services/DeviceManager.vala b/src/Services/DeviceManager.vala index f705172b..65e4d106 100644 --- a/src/Services/DeviceManager.vala +++ b/src/Services/DeviceManager.vala @@ -20,16 +20,10 @@ public class Power.Services.DeviceManager : Object { private const string UPOWER_INTERFACE = "org.freedesktop.UPower"; private const string UPOWER_PATH = "/org/freedesktop/UPower"; - - private const string GALA_INTERFACE = "io.elementary.gala"; - private const string GALA_PATH = "/io/elementary/gala/BrightnessManager"; - private static DeviceManager? instance = null; private DBusInterfaces.UPower? upower = null; - private DBusInterfaces.BrightnessManager? brightness_manager = null; - public Services.Backlight backlight { get; construct; } public Gee.HashMap devices { get; private set; } public Gee.Iterator batteries { get; private set; } public Device display_device { get; private set; } @@ -40,12 +34,7 @@ public class Power.Services.DeviceManager : Object { public signal void battery_registered (string device_path, Device battery); public signal void battery_deregistered (string device_path); - public signal void monitors_changed (); - public signal void monitor_brightness_changed (int index, double value); - construct { - backlight = new Services.Backlight (); - connect_to_bus.begin ((obj, res) => { if (connect_to_bus.end (res)) { update_properties (); @@ -77,17 +66,9 @@ public class Power.Services.DeviceManager : Object { ); debug ("Connection to UPower bus established"); - brightness_manager = yield Bus.get_proxy ( - BusType.SESSION, - GALA_INTERFACE, - GALA_PATH, - DBusProxyFlags.GET_INVALIDATED_PROPERTIES - ); - debug ("Connection to Power Settings bus established"); - return true; } catch (Error e) { - critical ("Connecting to UPower or PowerSettings bus failed: %s", e.message); + critical ("Connecting to UPower bus failed: %s", e.message); return false; } @@ -126,7 +107,7 @@ public class Power.Services.DeviceManager : Object { } } - private void connect_signals () requires (upower != null && brightness_manager != null) { + private void connect_signals () requires (upower != null) { upower.g_properties_changed.connect (() => { update_properties (); update_batteries (); @@ -134,9 +115,6 @@ public class Power.Services.DeviceManager : Object { upower.DeviceAdded.connect (register_device); upower.DeviceRemoved.connect (deregister_device); - - brightness_manager.monitors_changed.connect (monitors_changed_cb); - brightness_manager.monitor_brightness_changed.connect (monitor_brightness_changed_cb); } private void update_properties () requires (upower != null) { @@ -182,63 +160,4 @@ public class Power.Services.DeviceManager : Object { battery_deregistered (device_path); } } - - private void monitors_changed_cb () { - monitors_changed (); - } - - private void monitor_brightness_changed_cb (int index, double value) { - monitor_brightness_changed (index, value); - } - - public double get_monitor_brightness (int index) { - if (brightness_manager != null) { - try { - return brightness_manager.get_monitor_brightness (index); - } catch (Error e) { - warning ("Couldn't get monitor's brightness: %s", e.message); - } - } - return -1; - } - - public void set_monitor_brightness (int index, double value) { - if (brightness_manager != null) { - try { - brightness_manager.set_monitor_brightness (index, value); - } catch (Error e) { - warning ("Couldn't set monitor's brightness: %s", e.message); - } - } - } - - public string get_monitor_data (int index) { - if (brightness_manager != null) { - try { - return brightness_manager.get_monitor_name (index); - } catch (Error e) { - warning ("Couldn't get monitor's data: %s", e.message); - } - } - return ""; - } - - public int get_monitor_count () { - if (brightness_manager != null) { - try { - return brightness_manager.get_n_monitors (); - } catch (Error e) { - warning ("Couldn't get monitor's count: %s", e.message); - } - } - return 0; - } - - public void change_global_brightness (double change) { - try { - brightness_manager.set_global_brightness ((brightness_manager.get_global_brightness () + change).clamp (0.0, 1.0)); - } catch (Error e) { - warning ("Couldn't set global brightness: %s", e.message); - } - } } diff --git a/src/Utils.vala b/src/Utils.vala index 4fb9fb0f..9215fcb6 100644 --- a/src/Utils.vala +++ b/src/Utils.vala @@ -4,16 +4,54 @@ public class Power.Utils { private static double total_y_delta = 0; private static double total_x_delta = 0; + public static bool handle_global_scroll_event (Gdk.ScrollEvent e, + bool natural_scroll_mouse, + bool natural_scroll_touchpad) { + if (e.get_device () == null) { + return false; + } + + var dir = calculate_delta (e, natural_scroll_mouse, natural_scroll_touchpad); + + if (dir.abs () > 0.0) { + total_y_delta = 0.0; + total_x_delta = 0.0; + var delta = (Power.Services.BrightnessManager.get_default ().get_global_brightness () + dir * BRIGHTNESS_STEP); + Power.Services.BrightnessManager.get_default () + .set_global_brightness (delta); + } + + return Gdk.EVENT_STOP; + } + + public static bool handle_local_scroll_event (Gdk.ScrollEvent e, + bool natural_scroll_mouse, + bool natural_scroll_touchpad, + int index) { + if (e.get_device () == null) { + return false; + } + + var dir = calculate_delta (e, natural_scroll_mouse, natural_scroll_touchpad); + + if (dir.abs () > 0.0) { + total_y_delta = 0.0; + total_x_delta = 0.0; + var delta = (Power.Services.BrightnessManager.get_default ().get_monitor_brightness (index) + dir * BRIGHTNESS_STEP); + Power.Services.BrightnessManager.get_default () + .set_monitor_brightness (index, delta); + } + + return Gdk.EVENT_STOP; + } + /* Smooth scrolling vertical support. Accumulate delta_y until threshold exceeded before actioning */ - public static bool handle_scroll_event (Gdk.ScrollEvent e, - bool natural_scroll_mouse, - bool natural_scroll_touchpad) { + private static double calculate_delta (Gdk.ScrollEvent e, + bool natural_scroll_mouse, + bool natural_scroll_touchpad) { var dir = 0.0; bool natural_scroll; var event_device = e.get_device (); - if (event_device == null) { - return false; - } if (event_device.source == Gdk.InputSource.MOUSE) { natural_scroll = natural_scroll_mouse; @@ -27,31 +65,31 @@ public class Power.Utils { e.get_deltas (out delta_x, out delta_y); switch (e.get_direction ()) { - case Gdk.ScrollDirection.SMOOTH: - var abs_x = double.max (delta_x.abs (), 0.0001); - var abs_y = double.max (delta_y.abs (), 0.0001); - - if (abs_y / abs_x > 2.0) { - total_y_delta += delta_y; - } else if (abs_x / abs_y > 2.0) { - total_x_delta += delta_x; - } - - break; - case Gdk.ScrollDirection.UP: - total_y_delta = -1.0; - break; - case Gdk.ScrollDirection.DOWN: - total_y_delta = 1.0; - break; - case Gdk.ScrollDirection.LEFT: - total_x_delta = -1.0; - break; - case Gdk.ScrollDirection.RIGHT: - total_x_delta = 1.0; - break; - default: - break; + case Gdk.ScrollDirection.SMOOTH: + var abs_x = double.max (delta_x.abs (), 0.0001); + var abs_y = double.max (delta_y.abs (), 0.0001); + + if (abs_y / abs_x > 2.0) { + total_y_delta += delta_y; + } else if (abs_x / abs_y > 2.0) { + total_x_delta += delta_x; + } + + break; + case Gdk.ScrollDirection.UP: + total_y_delta = -1.0; + break; + case Gdk.ScrollDirection.DOWN: + total_y_delta = 1.0; + break; + case Gdk.ScrollDirection.LEFT: + total_x_delta = -1.0; + break; + case Gdk.ScrollDirection.RIGHT: + total_x_delta = 1.0; + break; + default: + break; } if (total_y_delta.abs () * BRIGHTNESS_STEP > 0.001) { @@ -60,13 +98,6 @@ public class Power.Utils { dir = natural_scroll ? -total_x_delta : total_x_delta; } - if (dir.abs () > 0.0) { - total_y_delta = 0.0; - total_x_delta = 0.0; - Power.Services.DeviceManager.get_default () - .change_global_brightness (dir * BRIGHTNESS_STEP); - } - - return Gdk.EVENT_STOP; + return dir; } } diff --git a/src/Widgets/PopoverWidget.vala b/src/Widgets/PopoverWidget.vala index 8be9f9f7..0085df5e 100644 --- a/src/Widgets/PopoverWidget.vala +++ b/src/Widgets/PopoverWidget.vala @@ -21,6 +21,7 @@ public class Power.Widgets.PopoverWidget : Gtk.Box { public bool is_in_session { get; construct; default = false; } private static Services.DeviceManager dm; + private static Services.BrightnessManager brightness_manager; private Gtk.Revealer device_separator_revealer; @@ -32,6 +33,7 @@ public class Power.Widgets.PopoverWidget : Gtk.Box { static construct { dm = Services.DeviceManager.get_default (); + brightness_manager = Services.BrightnessManager.get_default (); } construct { @@ -58,7 +60,7 @@ public class Power.Widgets.PopoverWidget : Gtk.Box { }; var last_separator_revealer = new Gtk.Revealer () { - reveal_child = dm.get_monitor_count () > 0, + reveal_child = brightness_manager.present, child = last_separator, }; @@ -95,8 +97,8 @@ public class Power.Widgets.PopoverWidget : Gtk.Box { append (device_list_revealer); append (device_separator_revealer); - if (dm.backlight.present) { - var screen_brightness = new ScreenBrightness (); + if (brightness_manager.present) { + var screen_brightness = new ScreenBrightnessList (); append (screen_brightness); } @@ -137,8 +139,8 @@ public class Power.Widgets.PopoverWidget : Gtk.Box { } }); - dm.monitors_changed.connect (() => { - if (dm.get_monitor_count () > 0) { + brightness_manager.monitors_changed.connect (() => { + if (brightness_manager.present) { last_separator_revealer.reveal_child = true; } else { last_separator_revealer.reveal_child = false; @@ -147,6 +149,6 @@ public class Power.Widgets.PopoverWidget : Gtk.Box { } private void update_device_separator_revealer () { - device_separator_revealer.reveal_child = dm.backlight.present && dm.has_battery; + device_separator_revealer.reveal_child = brightness_manager.present && dm.has_battery; } } diff --git a/src/Widgets/ScreenBrightnessList.vala b/src/Widgets/ScreenBrightnessList.vala new file mode 100644 index 00000000..c582d0c8 --- /dev/null +++ b/src/Widgets/ScreenBrightnessList.vala @@ -0,0 +1,46 @@ +/* + * Copyright 2011-2021 elementary, Inc. (https://elementary.io) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +public class Power.Widgets.ScreenBrightnessList : Granite.Bin { + private Power.Services.BrightnessManager brightness_manager; + private Gtk.ListBox list_box; + + public bool natural_scroll_touchpad { get; set; } + public bool natural_scroll_mouse { get; set; } + + construct { + brightness_manager = Power.Services.BrightnessManager.get_default (); + + list_box = new Gtk.ListBox (); + child = list_box; + + populate_list (); + + brightness_manager.monitors_changed.connect (() => { + list_box.remove_all (); + populate_list (); + }); + } + + private void populate_list () { + for (int i = 0; i < brightness_manager.get_n_monitors (); i++) { + list_box.append (new ScreenBrightenssRow (i)); + } + } +} diff --git a/src/Widgets/ScreenBrightness.vala b/src/Widgets/ScreenBrightnessRow.vala similarity index 52% rename from src/Widgets/ScreenBrightness.vala rename to src/Widgets/ScreenBrightnessRow.vala index 19b4f528..08c252e0 100644 --- a/src/Widgets/ScreenBrightness.vala +++ b/src/Widgets/ScreenBrightnessRow.vala @@ -1,31 +1,24 @@ /* - * Copyright 2011-2021 elementary, Inc. (https://elementary.io) + * Copyright 2026 elementary, Inc. (https://elementary.io) + * SPDX-License-Identifier: GPL-3.0-or-later * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, - * Boston, MA 02110-1301, USA. + * Authored by: Denis Garaev */ -public class Power.Widgets.ScreenBrightness : Granite.Bin { - private Power.Services.DeviceManager dm; - private Gtk.ListBox list_box; +public class Power.Widgets.ScreenBrightenssRow : Granite.Bin { + private Services.BrightnessManager brightness_manager; + + public int index { get; construct; } public bool natural_scroll_touchpad { get; set; } public bool natural_scroll_mouse { get; set; } + public ScreenBrightenssRow (int index) { + Object (index: index); + } + construct { - dm = Power.Services.DeviceManager.get_default (); + brightness_manager = Services.BrightnessManager.get_default (); var mouse_settings = new GLib.Settings ("org.gnome.desktop.peripherals.mouse"); mouse_settings.bind ("natural-scroll", this, "natural-scroll-mouse", SettingsBindFlags.DEFAULT); @@ -36,32 +29,18 @@ public class Power.Widgets.ScreenBrightness : Granite.Bin { scroll_controller.scroll.connect (on_scroll); add_controller (scroll_controller); - list_box = new Gtk.ListBox (); - child = list_box; - - populate_list (); - - dm.monitors_changed.connect (() => { - list_box.remove_all (); - populate_list (); - }); - } - - private void populate_list () { - for (int i = 0; i < dm.get_monitor_count (); i++) { - list_box.append (construct_row (i)); - } - } - - private Gtk.Widget construct_row (int index) { var image = new Gtk.Image.from_icon_name ("brightness-display-symbolic") { pixel_size = 48 }; - var monitor_label = new Gtk.Label (dm.get_monitor_data (index)) { + var monitor_label = new Gtk.Label (brightness_manager.get_monitor_name (index)) { halign = Gtk.Align.START }; + if (index == 0) { + monitor_label.set_text (monitor_label.get_text () + _(" (Primary)")); + } + var brightness_slider = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 1, 0.1) { margin_start = 2, margin_end = 2, @@ -88,13 +67,15 @@ public class Power.Widgets.ScreenBrightness : Granite.Bin { box.append (image); box.append (slider_box); + child = box; + ulong slider_signal = 0, dm_signal = 0; slider_signal = brightness_slider.value_changed.connect ((value) => { - SignalHandler.block (dm, dm_signal); - dm.set_monitor_brightness (index, value.get_value ()); - SignalHandler.unblock (dm, dm_signal); + SignalHandler.block (brightness_manager, dm_signal); + brightness_manager.set_monitor_brightness (index, value.get_value ()); + SignalHandler.unblock (brightness_manager, dm_signal); }); - dm_signal = dm.monitor_brightness_changed.connect ((ch_index, value) => { + dm_signal = brightness_manager.monitor_brightness_changed.connect ((ch_index, value) => { if (index != ch_index) { return; } @@ -104,11 +85,10 @@ public class Power.Widgets.ScreenBrightness : Granite.Bin { SignalHandler.unblock (brightness_slider, slider_signal); }); - brightness_slider.set_value (dm.get_monitor_brightness (index)); - return box; + brightness_slider.set_value (brightness_manager.get_monitor_brightness (index)); } private bool on_scroll (Gtk.EventControllerScroll controller, double dx, double dy) { - return Utils.handle_scroll_event ((Gdk.ScrollEvent) controller.get_current_event (), natural_scroll_mouse, natural_scroll_touchpad); + return Utils.handle_local_scroll_event ((Gdk.ScrollEvent) controller.get_current_event (), natural_scroll_mouse, natural_scroll_touchpad, index); } } diff --git a/src/meson.build b/src/meson.build index 7b074f87..e22d8267 100644 --- a/src/meson.build +++ b/src/meson.build @@ -14,8 +14,8 @@ config_in = configure_file( files = files( 'Indicator.vala', 'Utils.vala', - 'Services/Backlight/Backlight.vala', - 'Services/DBusInterfaces/BrightnessManager.vala', + 'Services/BrightnessManager.vala', + 'Services/DBusInterfaces/GalaBrightnessManager.vala', 'Services/DBusInterfaces/Device.vala', 'Services/DBusInterfaces/Properties.vala', 'Services/DBusInterfaces/UPower.vala', @@ -26,7 +26,8 @@ files = files( 'Widgets/DeviceRow.vala', 'Widgets/DisplayWidget.vala', 'Widgets/PopoverWidget.vala', - 'Widgets/ScreenBrightness.vala', + 'Widgets/ScreenBrightnessList.vala', + 'Widgets/ScreenBrightnessRow.vala', 'Widgets/PowerModeList.vala' ) From 0c4c43c31568529cd6fca742d9372bd25344f4ec Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Sun, 6 Sep 2026 22:26:00 +0300 Subject: [PATCH 04/21] Tweak appearance a bit --- src/Widgets/ScreenBrightnessList.vala | 10 +++++++++- src/Widgets/ScreenBrightnessRow.vala | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/src/Widgets/ScreenBrightnessList.vala b/src/Widgets/ScreenBrightnessList.vala index c582d0c8..8ae88e7f 100644 --- a/src/Widgets/ScreenBrightnessList.vala +++ b/src/Widgets/ScreenBrightnessList.vala @@ -27,7 +27,9 @@ public class Power.Widgets.ScreenBrightnessList : Granite.Bin { construct { brightness_manager = Power.Services.BrightnessManager.get_default (); - list_box = new Gtk.ListBox (); + list_box = new Gtk.ListBox () { + selection_mode = Gtk.SelectionMode.NONE + }; child = list_box; populate_list (); @@ -40,6 +42,12 @@ public class Power.Widgets.ScreenBrightnessList : Granite.Bin { private void populate_list () { for (int i = 0; i < brightness_manager.get_n_monitors (); i++) { + if (i != 0) { + list_box.append (new Gtk.Separator (Gtk.Orientation.HORIZONTAL) { + margin_top = 3, + margin_bottom = 3 + }); + } list_box.append (new ScreenBrightenssRow (i)); } } diff --git a/src/Widgets/ScreenBrightnessRow.vala b/src/Widgets/ScreenBrightnessRow.vala index 08c252e0..ed4e94af 100644 --- a/src/Widgets/ScreenBrightnessRow.vala +++ b/src/Widgets/ScreenBrightnessRow.vala @@ -34,6 +34,8 @@ public class Power.Widgets.ScreenBrightenssRow : Granite.Bin { }; var monitor_label = new Gtk.Label (brightness_manager.get_monitor_name (index)) { + margin_start = 2, + margin_top = 2, halign = Gtk.Align.START }; From a59d72f4adb38f3ae1fa942d2aad218723a4ed31 Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Thu, 24 Sep 2026 23:00:57 +0300 Subject: [PATCH 05/21] Colapse DBus interface class name --- src/Services/BrightnessManager.vala | 2 +- src/Services/DBusInterfaces/GalaBrightnessManager.vala | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Services/BrightnessManager.vala b/src/Services/BrightnessManager.vala index c003f6ca..ad1049aa 100644 --- a/src/Services/BrightnessManager.vala +++ b/src/Services/BrightnessManager.vala @@ -13,7 +13,7 @@ public class Power.Services.BrightnessManager : Object { public signal void monitors_changed (); public signal void monitor_brightness_changed (int index, double value); - private Power.Services.DBusInterfaces.GalaBrightnessManager? gala_brightness_manager; + private Power.GalaBrightnessManager? gala_brightness_manager; private static BrightnessManager? instance = null; diff --git a/src/Services/DBusInterfaces/GalaBrightnessManager.vala b/src/Services/DBusInterfaces/GalaBrightnessManager.vala index 5d1c6229..0acd6ec8 100644 --- a/src/Services/DBusInterfaces/GalaBrightnessManager.vala +++ b/src/Services/DBusInterfaces/GalaBrightnessManager.vala @@ -17,9 +17,8 @@ * Boston, MA 02110-1301, USA. */ -namespace Power.Services.DBusInterfaces { - [DBus (name = "io.elementary.gala.BrightnessManager")] - interface GalaBrightnessManager : GLib.Object { +[DBus (name = "io.elementary.gala.BrightnessManager")] +interface Power.GalaBrightnessManager : GLib.Object { public signal void monitors_changed (); public signal void monitor_brightness_changed (int index, double value); @@ -29,5 +28,4 @@ namespace Power.Services.DBusInterfaces { public abstract int get_n_monitors () throws GLib.IOError, GLib.DBusError; public abstract void set_global_brightness (double scale) throws GLib.IOError, GLib.DBusError; public abstract void set_monitor_brightness (int index, double brightness) throws GLib.IOError, GLib.DBusError; - } } From 074a3c40d698a730cfaea8c075829121e3be6149 Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Thu, 24 Sep 2026 23:02:00 +0300 Subject: [PATCH 06/21] Use correct DBus interface name --- src/Services/BrightnessManager.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Services/BrightnessManager.vala b/src/Services/BrightnessManager.vala index ad1049aa..962977ec 100644 --- a/src/Services/BrightnessManager.vala +++ b/src/Services/BrightnessManager.vala @@ -6,7 +6,7 @@ */ public class Power.Services.BrightnessManager : Object { - private const string GALA_INTERFACE = "io.elementary.gala"; + private const string GALA_INTERFACE = "io.elementary.gala.BrightnessManager"; private const string GALA_PATH = "/io/elementary/gala/BrightnessManager"; public signal void connected (); From 3a175c2c05a91569733a3a2355c3c032f3a6fc03 Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Thu, 24 Sep 2026 23:02:41 +0300 Subject: [PATCH 07/21] Utils: store natural scroll settings internally --- src/Indicator.vala | 11 +---------- src/Utils.vala | 23 +++++++++-------------- src/Widgets/ScreenBrightnessList.vala | 3 --- src/Widgets/ScreenBrightnessRow.vala | 14 +++----------- 4 files changed, 13 insertions(+), 38 deletions(-) diff --git a/src/Indicator.vala b/src/Indicator.vala index b67fa547..95ef52df 100644 --- a/src/Indicator.vala +++ b/src/Indicator.vala @@ -21,8 +21,6 @@ public class Power.Indicator : Wingpanel.Indicator { private const double LOW_BATTERY_PERCENTAGE = 20.0; public bool is_in_session { get; construct; default = false; } - public bool natural_scroll_touchpad { get; set; } - public bool natural_scroll_mouse { get; set; } private Widgets.DisplayWidget? display_widget = null; @@ -49,11 +47,6 @@ public class Power.Indicator : Wingpanel.Indicator { dm = Power.Services.DeviceManager.get_default (); brightness_manager = Services.BrightnessManager.get_default (); - var mouse_settings = new GLib.Settings ("org.gnome.desktop.peripherals.mouse"); - mouse_settings.bind ("natural-scroll", this, "natural-scroll-mouse", SettingsBindFlags.DEFAULT); - var touchpad_settings = new GLib.Settings ("org.gnome.desktop.peripherals.touchpad"); - touchpad_settings.bind ("natural-scroll", this, "natural-scroll-touchpad", SettingsBindFlags.DEFAULT); - settings = new GLib.Settings ("io.elementary.panel.power"); } @@ -210,9 +203,7 @@ public class Power.Indicator : Wingpanel.Indicator { var scroll_controller = new Gtk.EventControllerScroll (BOTH_AXES); scroll_controller.scroll.connect ((controller, dx, dy) => { if (Utils.handle_global_scroll_event ( - (Gdk.ScrollEvent) controller.get_current_event (), - natural_scroll_mouse, - natural_scroll_touchpad) + (Gdk.ScrollEvent) controller.get_current_event ()) ) { if (popover_widget == null || !popover_widget.is_visible ()) { show_notification (); diff --git a/src/Utils.vala b/src/Utils.vala index 9215fcb6..c2abf78d 100644 --- a/src/Utils.vala +++ b/src/Utils.vala @@ -3,15 +3,15 @@ public class Power.Utils { private const double BRIGHTNESS_STEP = 0.005; private static double total_y_delta = 0; private static double total_x_delta = 0; + private static GLib.Settings mouse_settings = new GLib.Settings ("org.gnome.desktop.peripherals.mouse"); + private static GLib.Settings touchpad_settings = new GLib.Settings ("org.gnome.desktop.peripherals.touchpad"); - public static bool handle_global_scroll_event (Gdk.ScrollEvent e, - bool natural_scroll_mouse, - bool natural_scroll_touchpad) { + public static bool handle_global_scroll_event (Gdk.ScrollEvent e) { if (e.get_device () == null) { return false; } - var dir = calculate_delta (e, natural_scroll_mouse, natural_scroll_touchpad); + var dir = calculate_delta (e); if (dir.abs () > 0.0) { total_y_delta = 0.0; @@ -24,15 +24,12 @@ public class Power.Utils { return Gdk.EVENT_STOP; } - public static bool handle_local_scroll_event (Gdk.ScrollEvent e, - bool natural_scroll_mouse, - bool natural_scroll_touchpad, - int index) { + public static bool handle_local_scroll_event (Gdk.ScrollEvent e, int index) { if (e.get_device () == null) { return false; } - var dir = calculate_delta (e, natural_scroll_mouse, natural_scroll_touchpad); + var dir = calculate_delta (e); if (dir.abs () > 0.0) { total_y_delta = 0.0; @@ -46,17 +43,15 @@ public class Power.Utils { } /* Smooth scrolling vertical support. Accumulate delta_y until threshold exceeded before actioning */ - private static double calculate_delta (Gdk.ScrollEvent e, - bool natural_scroll_mouse, - bool natural_scroll_touchpad) { + private static double calculate_delta (Gdk.ScrollEvent e) { var dir = 0.0; bool natural_scroll; var event_device = e.get_device (); if (event_device.source == Gdk.InputSource.MOUSE) { - natural_scroll = natural_scroll_mouse; + natural_scroll = mouse_settings.get_boolean ("natural-scroll"); } else if (event_device.source == Gdk.InputSource.TOUCHPAD) { - natural_scroll = natural_scroll_touchpad; + natural_scroll = touchpad_settings.get_boolean ("natural-scroll"); } else { natural_scroll = true; } diff --git a/src/Widgets/ScreenBrightnessList.vala b/src/Widgets/ScreenBrightnessList.vala index 8ae88e7f..69c80fcf 100644 --- a/src/Widgets/ScreenBrightnessList.vala +++ b/src/Widgets/ScreenBrightnessList.vala @@ -21,9 +21,6 @@ public class Power.Widgets.ScreenBrightnessList : Granite.Bin { private Power.Services.BrightnessManager brightness_manager; private Gtk.ListBox list_box; - public bool natural_scroll_touchpad { get; set; } - public bool natural_scroll_mouse { get; set; } - construct { brightness_manager = Power.Services.BrightnessManager.get_default (); diff --git a/src/Widgets/ScreenBrightnessRow.vala b/src/Widgets/ScreenBrightnessRow.vala index ed4e94af..f9a29280 100644 --- a/src/Widgets/ScreenBrightnessRow.vala +++ b/src/Widgets/ScreenBrightnessRow.vala @@ -5,26 +5,18 @@ * Authored by: Denis Garaev */ -public class Power.Widgets.ScreenBrightenssRow : Granite.Bin { +public class Power.Widgets.ScreenBrightnessRow : Granite.Bin { private Services.BrightnessManager brightness_manager; public int index { get; construct; } - public bool natural_scroll_touchpad { get; set; } - public bool natural_scroll_mouse { get; set; } - - public ScreenBrightenssRow (int index) { + public ScreenBrightnessRow (int index) { Object (index: index); } construct { brightness_manager = Services.BrightnessManager.get_default (); - var mouse_settings = new GLib.Settings ("org.gnome.desktop.peripherals.mouse"); - mouse_settings.bind ("natural-scroll", this, "natural-scroll-mouse", SettingsBindFlags.DEFAULT); - var touchpad_settings = new GLib.Settings ("org.gnome.desktop.peripherals.touchpad"); - touchpad_settings.bind ("natural-scroll", this, "natural-scroll-touchpad", SettingsBindFlags.DEFAULT); - var scroll_controller = new Gtk.EventControllerScroll (BOTH_AXES); scroll_controller.scroll.connect (on_scroll); add_controller (scroll_controller); @@ -91,6 +83,6 @@ public class Power.Widgets.ScreenBrightenssRow : Granite.Bin { } private bool on_scroll (Gtk.EventControllerScroll controller, double dx, double dy) { - return Utils.handle_local_scroll_event ((Gdk.ScrollEvent) controller.get_current_event (), natural_scroll_mouse, natural_scroll_touchpad, index); + return Utils.handle_local_scroll_event ((Gdk.ScrollEvent) controller.get_current_event (), index); } } From c385abc145395a6a018333444888bdc8e2f2d398 Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Thu, 24 Sep 2026 23:03:29 +0300 Subject: [PATCH 08/21] BrightnessManager: Simplify init --- src/Indicator.vala | 4 ++-- src/Services/BrightnessManager.vala | 30 +++++++---------------------- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/src/Indicator.vala b/src/Indicator.vala index 95ef52df..5ce0456a 100644 --- a/src/Indicator.vala +++ b/src/Indicator.vala @@ -59,10 +59,10 @@ public class Power.Indicator : Wingpanel.Indicator { update_visibility (); } + setup_scroll_controller (); dm.notify["has-battery"].connect (update_visibility); dm.notify["display-device"].connect (update_display_device); settings.changed["show-percentage"].connect (update_tooltip); - brightness_manager.connected.connect (update_scroll_controller); } return display_widget; @@ -198,7 +198,7 @@ public class Power.Indicator : Wingpanel.Indicator { return false; } - private void update_scroll_controller () { + private void setup_scroll_controller () { if (brightness_manager.present) { var scroll_controller = new Gtk.EventControllerScroll (BOTH_AXES); scroll_controller.scroll.connect ((controller, dx, dy) => { diff --git a/src/Services/BrightnessManager.vala b/src/Services/BrightnessManager.vala index 962977ec..40746077 100644 --- a/src/Services/BrightnessManager.vala +++ b/src/Services/BrightnessManager.vala @@ -9,7 +9,6 @@ public class Power.Services.BrightnessManager : Object { private const string GALA_INTERFACE = "io.elementary.gala.BrightnessManager"; private const string GALA_PATH = "/io/elementary/gala/BrightnessManager"; - public signal void connected (); public signal void monitors_changed (); public signal void monitor_brightness_changed (int index, double value); @@ -34,12 +33,13 @@ public class Power.Services.BrightnessManager : Object { } construct { - init.begin ((obj, res) => { - try { - init.end (res); - connect_signals (); - } catch {} - }); + try { + gala_brightness_manager = Bus.get_proxy_sync (BusType.SESSION, GALA_INTERFACE, GALA_PATH); + gala_brightness_manager.monitors_changed.connect (on_monitors_changed); + gala_brightness_manager.monitor_brightness_changed.connect (on_monitor_brightness_changed); + } catch (Error e) { + warning ("Couldn't connect to Gala's BrightnessManager: %s", e.message); + } } public static Power.Services.BrightnessManager get_default () { @@ -102,22 +102,6 @@ public class Power.Services.BrightnessManager : Object { } } - - private async void init () throws Error { - try { - gala_brightness_manager = yield Bus.get_proxy (BusType.SESSION, GALA_INTERFACE, GALA_PATH); - connected (); - } catch (Error e) { - warning ("Couldn't connect to Gala's BrightnessManager: %s", e.message); - throw e; - } - } - - private void connect_signals () { - gala_brightness_manager.monitors_changed.connect (on_monitors_changed); - gala_brightness_manager.monitor_brightness_changed.connect (on_monitor_brightness_changed); - } - private void on_monitors_changed () { monitors_changed (); } From ca51f5760e6ee5ad05e6b39764bf4f2e571868b6 Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Thu, 24 Sep 2026 23:04:50 +0300 Subject: [PATCH 09/21] ScreenBrightnessList: use ListBox's separator --- src/Widgets/ScreenBrightnessList.vala | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/src/Widgets/ScreenBrightnessList.vala b/src/Widgets/ScreenBrightnessList.vala index 69c80fcf..d315557c 100644 --- a/src/Widgets/ScreenBrightnessList.vala +++ b/src/Widgets/ScreenBrightnessList.vala @@ -25,27 +25,20 @@ public class Power.Widgets.ScreenBrightnessList : Granite.Bin { brightness_manager = Power.Services.BrightnessManager.get_default (); list_box = new Gtk.ListBox () { - selection_mode = Gtk.SelectionMode.NONE + selection_mode = Gtk.SelectionMode.NONE, + show_separators = true }; child = list_box; populate_list (); - brightness_manager.monitors_changed.connect (() => { - list_box.remove_all (); - populate_list (); - }); + brightness_manager.monitors_changed.connect (populate_list); } private void populate_list () { + list_box.remove_all (); for (int i = 0; i < brightness_manager.get_n_monitors (); i++) { - if (i != 0) { - list_box.append (new Gtk.Separator (Gtk.Orientation.HORIZONTAL) { - margin_top = 3, - margin_bottom = 3 - }); - } - list_box.append (new ScreenBrightenssRow (i)); + list_box.append (new ScreenBrightnessRow (i)); } } } From b6d92bbe9330f6194443eb0a1e6a49974f901251 Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Thu, 24 Sep 2026 23:05:33 +0300 Subject: [PATCH 10/21] BrightnessManager: Separate monitor detection into separate property --- src/Services/BrightnessManager.vala | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/Services/BrightnessManager.vala b/src/Services/BrightnessManager.vala index 40746077..60fe2f0e 100644 --- a/src/Services/BrightnessManager.vala +++ b/src/Services/BrightnessManager.vala @@ -22,11 +22,19 @@ public class Power.Services.BrightnessManager : Object { return false; } - try { - if (gala_brightness_manager.get_n_monitors () == 0) { - return false; - } - } catch {} + return true; + } + } + + public bool has_monitors { + get { + if (gala_brightness_manager == null) { + return false; + } + + if (get_n_monitors () <= 0) { + return false; + } return true; } From 5ff0d1ebc092f51f4b8c8e2ba96a7b1a7804e379 Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Thu, 24 Sep 2026 23:09:45 +0300 Subject: [PATCH 11/21] PopoverWidget: Properly hide extra separators --- src/Widgets/PopoverWidget.vala | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/Widgets/PopoverWidget.vala b/src/Widgets/PopoverWidget.vala index 0085df5e..328b92a7 100644 --- a/src/Widgets/PopoverWidget.vala +++ b/src/Widgets/PopoverWidget.vala @@ -117,6 +117,9 @@ public class Power.Widgets.PopoverWidget : Gtk.Box { dm.notify["has-battery"].connect ((s, p) => { update_device_separator_revealer (); }); + brightness_manager.notify["has-monitors"].connect ((s, p) => { + update_device_separator_revealer (); + }); settings.bind ("show-percentage", show_percent_switch, "active", SettingsBindFlags.DEFAULT); @@ -138,17 +141,9 @@ public class Power.Widgets.PopoverWidget : Gtk.Box { warning ("Failed to open power settings: %s", e.message); } }); - - brightness_manager.monitors_changed.connect (() => { - if (brightness_manager.present) { - last_separator_revealer.reveal_child = true; - } else { - last_separator_revealer.reveal_child = false; - } - }); } private void update_device_separator_revealer () { - device_separator_revealer.reveal_child = brightness_manager.present && dm.has_battery; + device_separator_revealer.reveal_child = brightness_manager.has_monitors && dm.has_battery; } } From 10e07ce31c256d1008da8a1c99841d9b72d44bf5 Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Sat, 3 Oct 2026 11:05:12 +0300 Subject: [PATCH 12/21] Indicator: Hide when there is no monitors --- src/Indicator.vala | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Indicator.vala b/src/Indicator.vala index 5ce0456a..e2c8e102 100644 --- a/src/Indicator.vala +++ b/src/Indicator.vala @@ -55,13 +55,14 @@ public class Power.Indicator : Wingpanel.Indicator { display_widget = new Widgets.DisplayWidget (); /* No need to display the indicator when the device is completely in AC mode */ - if (dm.has_battery || brightness_manager.present) { + if (dm.has_battery || brightness_manager.has_monitors) { update_visibility (); } setup_scroll_controller (); dm.notify["has-battery"].connect (update_visibility); dm.notify["display-device"].connect (update_display_device); + brightness_manager.notify["has-monitors"].connect (update_visibility); settings.changed["show-percentage"].connect (update_tooltip); } @@ -85,7 +86,7 @@ public class Power.Indicator : Wingpanel.Indicator { private void update_visibility () { var dm = Services.DeviceManager.get_default (); - bool should_be_visible = (dm.has_battery || brightness_manager.present); + bool should_be_visible = (dm.has_battery || brightness_manager.has_monitors); if (visible != should_be_visible) { /* NOTE: popover closes every time you set visibility, so change property only when needed */ visible = should_be_visible; @@ -164,7 +165,7 @@ public class Power.Indicator : Wingpanel.Indicator { } } - if (primary_text == null && brightness_manager.present) { + if (primary_text == null && brightness_manager.has_monitors) { primary_text = _("Screen brightness: %i").printf ((int) (brightness_manager.get_global_brightness () * 100)); secondary_text = _("Scroll to change screen brightness"); } From cea46cc862fc1eb40a8da9db64cc1e626093455b Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Sat, 3 Oct 2026 11:07:19 +0300 Subject: [PATCH 13/21] ScreenBrighnessRow: Use `Granite.Box` --- src/Widgets/ScreenBrightnessRow.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Widgets/ScreenBrightnessRow.vala b/src/Widgets/ScreenBrightnessRow.vala index f9a29280..5091bc01 100644 --- a/src/Widgets/ScreenBrightnessRow.vala +++ b/src/Widgets/ScreenBrightnessRow.vala @@ -43,7 +43,7 @@ public class Power.Widgets.ScreenBrightnessRow : Granite.Bin { width_request = 175 }; - var slider_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 2) { + var slider_box = new Granite.Box (Gtk.Orientation.VERTICAL, Granite.Box.Spacing.NONE) { hexpand = true, vexpand = true, homogeneous = true @@ -52,7 +52,7 @@ public class Power.Widgets.ScreenBrightnessRow : Granite.Bin { slider_box.append (monitor_label); slider_box.append (brightness_slider); - var box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 4) { + var box = new Granite.Box (Gtk.Orientation.HORIZONTAL, Granite.Box.Spacing.HALF) { hexpand = true, margin_start = 6, margin_end = 12 From 956c5d1c3b7aadbab1a378f7f22bcf3338501bbf Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Sat, 3 Oct 2026 11:08:01 +0300 Subject: [PATCH 14/21] ScreenBrighnessRow: Avoid using lambdas --- src/Widgets/ScreenBrightnessRow.vala | 39 ++++++++++++++++------------ 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/src/Widgets/ScreenBrightnessRow.vala b/src/Widgets/ScreenBrightnessRow.vala index 5091bc01..cf5d143f 100644 --- a/src/Widgets/ScreenBrightnessRow.vala +++ b/src/Widgets/ScreenBrightnessRow.vala @@ -7,6 +7,9 @@ public class Power.Widgets.ScreenBrightnessRow : Granite.Bin { private Services.BrightnessManager brightness_manager; + private Gtk.Scale brightness_slider; + private ulong slider_signal; + private ulong bm_signal; public int index { get; construct; } @@ -35,7 +38,7 @@ public class Power.Widgets.ScreenBrightnessRow : Granite.Bin { monitor_label.set_text (monitor_label.get_text () + _(" (Primary)")); } - var brightness_slider = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 1, 0.1) { + brightness_slider = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 1, 0.1) { margin_start = 2, margin_end = 2, hexpand = true, @@ -63,25 +66,29 @@ public class Power.Widgets.ScreenBrightnessRow : Granite.Bin { child = box; - ulong slider_signal = 0, dm_signal = 0; - slider_signal = brightness_slider.value_changed.connect ((value) => { - SignalHandler.block (brightness_manager, dm_signal); - brightness_manager.set_monitor_brightness (index, value.get_value ()); - SignalHandler.unblock (brightness_manager, dm_signal); - }); - dm_signal = brightness_manager.monitor_brightness_changed.connect ((ch_index, value) => { - if (index != ch_index) { - return; - } - - SignalHandler.block (brightness_slider, slider_signal); - brightness_slider.set_value (value); - SignalHandler.unblock (brightness_slider, slider_signal); - }); + slider_signal = brightness_slider.value_changed.connect (on_value_changed_internally); + bm_signal = brightness_manager.monitor_brightness_changed.connect (on_value_changed_externally); brightness_slider.set_value (brightness_manager.get_monitor_brightness (index)); } + // We'd need to disable signals temporary here, so there wouldn't be a vicious signal loop + private void on_value_changed_internally (Gtk.Range value) { + SignalHandler.block (brightness_manager, bm_signal); + brightness_manager.set_monitor_brightness (index, value.get_value ()); + SignalHandler.unblock (brightness_manager, bm_signal); + } + + private void on_value_changed_externally (int ch_index, double value) { + if (index != ch_index) { + return; + } + + SignalHandler.block (brightness_slider, slider_signal); + brightness_slider.set_value (value); + SignalHandler.unblock (brightness_slider, slider_signal); + } + private bool on_scroll (Gtk.EventControllerScroll controller, double dx, double dy) { return Utils.handle_local_scroll_event ((Gdk.ScrollEvent) controller.get_current_event (), index); } From fb47c4dcc2656775e28e743cfbd0ba439bfbb4ba Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Sat, 3 Oct 2026 12:03:49 +0300 Subject: [PATCH 15/21] ScreenBrightnessRow: Use printf --- src/Widgets/ScreenBrightnessRow.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Widgets/ScreenBrightnessRow.vala b/src/Widgets/ScreenBrightnessRow.vala index cf5d143f..c276cfda 100644 --- a/src/Widgets/ScreenBrightnessRow.vala +++ b/src/Widgets/ScreenBrightnessRow.vala @@ -35,7 +35,7 @@ public class Power.Widgets.ScreenBrightnessRow : Granite.Bin { }; if (index == 0) { - monitor_label.set_text (monitor_label.get_text () + _(" (Primary)")); + monitor_label.set_text (_("%s (Primary)".printf (monitor_label.get_text ()))); } brightness_slider = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 1, 0.1) { From 7cbf495b3d0a97601157b58f3769892c6761e4fb Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Sat, 3 Oct 2026 12:17:55 +0300 Subject: [PATCH 16/21] Utils: Don't try to change monitor's brightness if there is no monitors So there would be no warning when we are trying to scroll on top of indicator while there is no suitable monitors with brightness control --- src/Utils.vala | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Utils.vala b/src/Utils.vala index c2abf78d..cbc46b98 100644 --- a/src/Utils.vala +++ b/src/Utils.vala @@ -7,7 +7,8 @@ public class Power.Utils { private static GLib.Settings touchpad_settings = new GLib.Settings ("org.gnome.desktop.peripherals.touchpad"); public static bool handle_global_scroll_event (Gdk.ScrollEvent e) { - if (e.get_device () == null) { + var bm = Power.Services.BrightnessManager.get_default (); + if (e.get_device () == null || bm.has_monitors == false) { return false; } @@ -16,16 +17,16 @@ public class Power.Utils { if (dir.abs () > 0.0) { total_y_delta = 0.0; total_x_delta = 0.0; - var delta = (Power.Services.BrightnessManager.get_default ().get_global_brightness () + dir * BRIGHTNESS_STEP); - Power.Services.BrightnessManager.get_default () - .set_global_brightness (delta); + var delta = (bm.get_global_brightness () + dir * BRIGHTNESS_STEP); + bm.set_global_brightness (delta); } return Gdk.EVENT_STOP; } public static bool handle_local_scroll_event (Gdk.ScrollEvent e, int index) { - if (e.get_device () == null) { + var bm = Power.Services.BrightnessManager.get_default (); + if (e.get_device () == null || bm.has_monitors == false) { return false; } @@ -34,9 +35,8 @@ public class Power.Utils { if (dir.abs () > 0.0) { total_y_delta = 0.0; total_x_delta = 0.0; - var delta = (Power.Services.BrightnessManager.get_default ().get_monitor_brightness (index) + dir * BRIGHTNESS_STEP); - Power.Services.BrightnessManager.get_default () - .set_monitor_brightness (index, delta); + var delta = (bm.get_monitor_brightness (index) + dir * BRIGHTNESS_STEP); + bm.set_monitor_brightness (index, delta); } return Gdk.EVENT_STOP; From d7c57bffbb7622854fa815e8b2c6341ab9f77d25 Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Sat, 10 Oct 2026 00:30:17 +0300 Subject: [PATCH 17/21] Use modern license headers --- .../DBusInterfaces/GalaBrightnessManager.vala | 18 ++---------------- src/Widgets/ScreenBrightnessList.vala | 18 ++---------------- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/src/Services/DBusInterfaces/GalaBrightnessManager.vala b/src/Services/DBusInterfaces/GalaBrightnessManager.vala index 0acd6ec8..431ea2d1 100644 --- a/src/Services/DBusInterfaces/GalaBrightnessManager.vala +++ b/src/Services/DBusInterfaces/GalaBrightnessManager.vala @@ -1,20 +1,6 @@ /* - * Copyright (c) 2011-2018 elementary LLC. (https://elementary.io) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, - * Boston, MA 02110-1301, USA. + * Copyright 2026 elementary, Inc. (https://elementary.io) + * SPDX-License-Identifier: GPL-3.0-or-later */ [DBus (name = "io.elementary.gala.BrightnessManager")] diff --git a/src/Widgets/ScreenBrightnessList.vala b/src/Widgets/ScreenBrightnessList.vala index d315557c..b8028326 100644 --- a/src/Widgets/ScreenBrightnessList.vala +++ b/src/Widgets/ScreenBrightnessList.vala @@ -1,20 +1,6 @@ /* - * Copyright 2011-2021 elementary, Inc. (https://elementary.io) - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street - Fifth Floor, - * Boston, MA 02110-1301, USA. + * Copyright 2026 elementary, Inc. (https://elementary.io) + * SPDX-License-Identifier: GPL-3.0-or-later */ public class Power.Widgets.ScreenBrightnessList : Granite.Bin { From 605af476bbfbd070bce3038f2d96d9a9b67d7211 Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Sat, 10 Oct 2026 00:31:59 +0300 Subject: [PATCH 18/21] BrightnessManager: Simplify getters --- src/Services/BrightnessManager.vala | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/Services/BrightnessManager.vala b/src/Services/BrightnessManager.vala index 60fe2f0e..af481e3d 100644 --- a/src/Services/BrightnessManager.vala +++ b/src/Services/BrightnessManager.vala @@ -17,13 +17,7 @@ public class Power.Services.BrightnessManager : Object { private static BrightnessManager? instance = null; public bool present { - get { - if (gala_brightness_manager == null) { - return false; - } - - return true; - } + get { return gala_brightness_manager != null; } } public bool has_monitors { @@ -32,11 +26,7 @@ public class Power.Services.BrightnessManager : Object { return false; } - if (get_n_monitors () <= 0) { - return false; - } - - return true; + return get_n_monitors () > 0; } } From 884b4bd9e6bffcde3f5a9f3fd7c02cdedce22ee5 Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Sat, 10 Oct 2026 00:32:30 +0300 Subject: [PATCH 19/21] ScreenBrightnessRow: Colapse Gtk/Granite namespaces --- src/Widgets/ScreenBrightnessRow.vala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Widgets/ScreenBrightnessRow.vala b/src/Widgets/ScreenBrightnessRow.vala index c276cfda..5f5e4303 100644 --- a/src/Widgets/ScreenBrightnessRow.vala +++ b/src/Widgets/ScreenBrightnessRow.vala @@ -38,7 +38,7 @@ public class Power.Widgets.ScreenBrightnessRow : Granite.Bin { monitor_label.set_text (_("%s (Primary)".printf (monitor_label.get_text ()))); } - brightness_slider = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 1, 0.1) { + brightness_slider = new Gtk.Scale.with_range (HORIZONTAL, 0, 1, 0.1) { margin_start = 2, margin_end = 2, hexpand = true, @@ -46,7 +46,7 @@ public class Power.Widgets.ScreenBrightnessRow : Granite.Bin { width_request = 175 }; - var slider_box = new Granite.Box (Gtk.Orientation.VERTICAL, Granite.Box.Spacing.NONE) { + var slider_box = new Granite.Box (VERTICAL, NONE) { hexpand = true, vexpand = true, homogeneous = true @@ -55,7 +55,7 @@ public class Power.Widgets.ScreenBrightnessRow : Granite.Bin { slider_box.append (monitor_label); slider_box.append (brightness_slider); - var box = new Granite.Box (Gtk.Orientation.HORIZONTAL, Granite.Box.Spacing.HALF) { + var box = new Granite.Box (HORIZONTAL, HALF) { hexpand = true, margin_start = 6, margin_end = 12 From 0f637788f267ec9aca8942b61394c2a899ad32ee Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Sat, 10 Oct 2026 00:32:43 +0300 Subject: [PATCH 20/21] PopoverWidget: Avoid using lambdas --- src/Widgets/PopoverWidget.vala | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/Widgets/PopoverWidget.vala b/src/Widgets/PopoverWidget.vala index 328b92a7..ea05a1b2 100644 --- a/src/Widgets/PopoverWidget.vala +++ b/src/Widgets/PopoverWidget.vala @@ -114,12 +114,8 @@ public class Power.Widgets.PopoverWidget : Gtk.Box { update_device_separator_revealer (); - dm.notify["has-battery"].connect ((s, p) => { - update_device_separator_revealer (); - }); - brightness_manager.notify["has-monitors"].connect ((s, p) => { - update_device_separator_revealer (); - }); + dm.notify["has-battery"].connect (update_device_separator_revealer); + brightness_manager.notify["has-monitors"].connect (update_device_separator_revealer); settings.bind ("show-percentage", show_percent_switch, "active", SettingsBindFlags.DEFAULT); From bfa65968d39a92e4215e1e375546e37e242aca34 Mon Sep 17 00:00:00 2001 From: Denis Garaev Date: Wed, 14 Oct 2026 20:34:23 +0300 Subject: [PATCH 21/21] Utils: Actually get scroll settings --- src/Utils.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Utils.vala b/src/Utils.vala index cbc46b98..ead2f18e 100644 --- a/src/Utils.vala +++ b/src/Utils.vala @@ -3,8 +3,6 @@ public class Power.Utils { private const double BRIGHTNESS_STEP = 0.005; private static double total_y_delta = 0; private static double total_x_delta = 0; - private static GLib.Settings mouse_settings = new GLib.Settings ("org.gnome.desktop.peripherals.mouse"); - private static GLib.Settings touchpad_settings = new GLib.Settings ("org.gnome.desktop.peripherals.touchpad"); public static bool handle_global_scroll_event (Gdk.ScrollEvent e) { var bm = Power.Services.BrightnessManager.get_default (); @@ -47,6 +45,8 @@ public class Power.Utils { var dir = 0.0; bool natural_scroll; var event_device = e.get_device (); + var mouse_settings = new GLib.Settings ("org.gnome.desktop.peripherals.mouse"); + var touchpad_settings = new GLib.Settings ("org.gnome.desktop.peripherals.touchpad"); if (event_device.source == Gdk.InputSource.MOUSE) { natural_scroll = mouse_settings.get_boolean ("natural-scroll");