Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
96d1856
DeviceManager: use gala's brightness interface
garaevdi Jul 17, 2026
3d34157
Merge branch 'main' into gala-brightness-interface
zeebok Aug 27, 2026
8a12a7c
Update for interface changes
garaevdi Aug 30, 2026
29b4e17
Merge branch 'main' into gala-brightness-interface
garaevdi Aug 30, 2026
3063d97
Adressing comments
garaevdi Sep 6, 2026
0c4c43c
Tweak appearance a bit
garaevdi Sep 6, 2026
d92efc4
Merge branch 'main' into gala-brightness-interface
zeebok Sep 21, 2026
a59d72f
Colapse DBus interface class name
garaevdi Sep 24, 2026
074a3c4
Use correct DBus interface name
garaevdi Sep 24, 2026
3a175c2
Utils: store natural scroll settings internally
garaevdi Sep 24, 2026
c385abc
BrightnessManager: Simplify init
garaevdi Sep 24, 2026
ca51f57
ScreenBrightnessList: use ListBox's separator
garaevdi Sep 24, 2026
b6d92bb
BrightnessManager: Separate monitor detection into separate property
garaevdi Sep 24, 2026
5ff0d1e
PopoverWidget: Properly hide extra separators
garaevdi Sep 24, 2026
10e07ce
Indicator: Hide when there is no monitors
garaevdi Oct 3, 2026
cea46cc
ScreenBrighnessRow: Use `Granite.Box`
garaevdi Oct 3, 2026
956c5d1
ScreenBrighnessRow: Avoid using lambdas
garaevdi Oct 3, 2026
fb47c4d
ScreenBrightnessRow: Use printf
garaevdi Oct 3, 2026
7cbf495
Utils: Don't try to change monitor's brightness if there is no monitors
garaevdi Oct 3, 2026
d7c57bf
Use modern license headers
garaevdi Oct 9, 2026
605af47
BrightnessManager: Simplify getters
garaevdi Oct 9, 2026
884b4bd
ScreenBrightnessRow: Colapse Gtk/Granite namespaces
garaevdi Oct 9, 2026
0f63778
PopoverWidget: Avoid using lambdas
garaevdi Oct 9, 2026
bfa6596
Utils: Actually get scroll settings
garaevdi Oct 14, 2026
528d435
Merge branch 'main' into gala-brightness-interface
zeebok Oct 25, 2026
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
65 changes: 31 additions & 34 deletions src/Indicator.vala
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,14 @@ 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;

private Widgets.PopoverWidget? popover_widget = null;

private Services.Device? display_device = null;
private Services.DeviceManager dm;
private Services.BrightnessManager brightness_manager;

private Settings settings;

Expand All @@ -46,11 +45,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 ();

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);
brightness_manager = Services.BrightnessManager.get_default ();

settings = new GLib.Settings ("io.elementary.panel.power");
}
Expand All @@ -60,35 +55,15 @@ 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.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);

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.brightness_changed.connect (update_tooltip);
}
}

return display_widget;
Expand All @@ -111,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 || dm.backlight.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;
Expand Down Expand Up @@ -190,8 +165,8 @@ public class Power.Indicator : Wingpanel.Indicator {
}
}

if (primary_text == null && dm.backlight.present) {
primary_text = _("Screen brightness: %i").printf ((int)(dm.brightness));
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");
}

Expand All @@ -211,7 +186,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) (brightness_manager.get_global_brightness () * 100)));
try {
notification.show ();
return true;
Expand All @@ -223,6 +198,28 @@ public class Power.Indicator : Wingpanel.Indicator {

return false;
}

private void setup_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 ())
) {
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.ServerType server_type) {
Expand Down
48 changes: 0 additions & 48 deletions src/Services/Backlight/Backlight.vala

This file was deleted.

110 changes: 110 additions & 0 deletions src/Services/BrightnessManager.vala
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
/*
* Copyright 2026 elementary, Inc. (https://elementary.io)
* SPDX-License-Identifier: GPL-3.0-or-later
*
* Authored by: Denis Garaev <garaevdi@outlook.com>
*/

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 monitors_changed ();
public signal void monitor_brightness_changed (int index, double value);

private Power.GalaBrightnessManager? gala_brightness_manager;

private static BrightnessManager? instance = null;

public bool present {
Comment thread
leolost2605 marked this conversation as resolved.
Resolved
get { return gala_brightness_manager != null; }
}

public bool has_monitors {
get {
if (gala_brightness_manager == null) {
return false;
}

return get_n_monitors () > 0;
}
}

construct {
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 () {
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);
}
}

Comment thread
garaevdi marked this conversation as resolved.
Resolved
private void on_monitors_changed () {
monitors_changed ();
}

private void on_monitor_brightness_changed (int index, double value) {
monitor_brightness_changed (index, value);
}
}
17 changes: 17 additions & 0 deletions src/Services/DBusInterfaces/GalaBrightnessManager.vala
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
/*
* Copyright 2026 elementary, Inc. (https://elementary.io)
* SPDX-License-Identifier: GPL-3.0-or-later
*/
Comment thread
leolost2605 marked this conversation as resolved.
Resolved

[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);

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;
}
25 changes: 0 additions & 25 deletions src/Services/DBusInterfaces/Screen.vala

This file was deleted.

Loading
Loading