From 495bd6a14347041a69794873b6f527676e6dd630 Mon Sep 17 00:00:00 2001 From: Trevor Busk Date: Fri, 21 Nov 2025 19:40:10 -0500 Subject: [PATCH 1/5] patch: fix height issue with switch --- src/Widgets/BatteryBox.vala | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Widgets/BatteryBox.vala b/src/Widgets/BatteryBox.vala index 1a95bacb..3b22b99f 100644 --- a/src/Widgets/BatteryBox.vala +++ b/src/Widgets/BatteryBox.vala @@ -8,7 +8,7 @@ public class Power.BatteryBox : Gtk.Grid { var battery_header = new Granite.HeaderLabel (""); var devices_box = new Gtk.Box (HORIZONTAL, 24) { - margin_bottom = 6 + margin_bottom = 16 }; var batteries = PowerManager.get_default ().batteries; @@ -27,9 +27,12 @@ public class Power.BatteryBox : Gtk.Grid { halign = END }; - var show_percent_label = new Granite.HeaderLabel (_("Show Percentage In Panel")) { - mnemonic_widget = show_percent_switch + var show_percent_label = new Gtk.Label (_("Show Percentage In Panel")) { + mnemonic_widget = show_percent_switch, + halign = Gtk.Align.START }; + + show_percent_label.add_css_class (Granite.STYLE_CLASS_H4_LABEL); var wingpanel_power_settings = new Settings ("io.elementary.desktop.wingpanel.power"); wingpanel_power_settings.bind ("show-percentage", show_percent_switch, "active", DEFAULT); From 1afa6c9866715464c481a6fc905a34b6305ffd13 Mon Sep 17 00:00:00 2001 From: Trevor Busk Date: Fri, 21 Nov 2025 22:04:55 -0500 Subject: [PATCH 2/5] change: fix deprecated syntax and bottom margin --- src/Widgets/BatteryBox.vala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Widgets/BatteryBox.vala b/src/Widgets/BatteryBox.vala index 3b22b99f..597fa711 100644 --- a/src/Widgets/BatteryBox.vala +++ b/src/Widgets/BatteryBox.vala @@ -8,7 +8,7 @@ public class Power.BatteryBox : Gtk.Grid { var battery_header = new Granite.HeaderLabel (""); var devices_box = new Gtk.Box (HORIZONTAL, 24) { - margin_bottom = 16 + margin_bottom = 6 }; var batteries = PowerManager.get_default ().batteries; @@ -31,8 +31,8 @@ public class Power.BatteryBox : Gtk.Grid { mnemonic_widget = show_percent_switch, halign = Gtk.Align.START }; - - show_percent_label.add_css_class (Granite.STYLE_CLASS_H4_LABEL); + + show_percent_label.add_css_class (Granite.HeaderLabel.Size.H4.to_string ()); var wingpanel_power_settings = new Settings ("io.elementary.desktop.wingpanel.power"); wingpanel_power_settings.bind ("show-percentage", show_percent_switch, "active", DEFAULT); From 258e62b3e38a3ecffe4146d2967b03461517b2c4 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 22 Nov 2025 14:43:20 +0900 Subject: [PATCH 3/5] Correctly Use Granite.HeaderLabel.Size --- README.md | 2 +- src/Widgets/BatteryBox.vala | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index aad3f107..24438a55 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ You'll need the following dependencies: * libadwaita-1-dev * libdbus-1-dev * libswitchboard-3-dev -* libgranite-7-dev +* libgranite-7-dev (>=7.7.0) * libpolkit-gobject-1-dev * meson * valac diff --git a/src/Widgets/BatteryBox.vala b/src/Widgets/BatteryBox.vala index 597fa711..defe3071 100644 --- a/src/Widgets/BatteryBox.vala +++ b/src/Widgets/BatteryBox.vala @@ -27,13 +27,12 @@ public class Power.BatteryBox : Gtk.Grid { halign = END }; - var show_percent_label = new Gtk.Label (_("Show Percentage In Panel")) { + var show_percent_label = new Granite.HeaderLabel (_("Show Percentage In Panel")) { mnemonic_widget = show_percent_switch, - halign = Gtk.Align.START + halign = Gtk.Align.START, + size = H4 }; - show_percent_label.add_css_class (Granite.HeaderLabel.Size.H4.to_string ()); - var wingpanel_power_settings = new Settings ("io.elementary.desktop.wingpanel.power"); wingpanel_power_settings.bind ("show-percentage", show_percent_switch, "active", DEFAULT); From c9178bcf83c46d8f6b94be32a1de06ca99997161 Mon Sep 17 00:00:00 2001 From: Trevor Busk Date: Sun, 23 Nov 2025 21:32:40 -0500 Subject: [PATCH 4/5] patch: fix excess height issue with battery % switch --- src/Widgets/BatteryBox.vala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Widgets/BatteryBox.vala b/src/Widgets/BatteryBox.vala index defe3071..a9b67e7e 100644 --- a/src/Widgets/BatteryBox.vala +++ b/src/Widgets/BatteryBox.vala @@ -24,12 +24,12 @@ public class Power.BatteryBox : Gtk.Grid { ); var show_percent_switch = new Gtk.Switch () { - halign = END + halign = END, + valign = Gtk.Align.CENTER, }; var show_percent_label = new Granite.HeaderLabel (_("Show Percentage In Panel")) { mnemonic_widget = show_percent_switch, - halign = Gtk.Align.START, size = H4 }; From f828663745b3d482f99b4c282b0f2173a4f01752 Mon Sep 17 00:00:00 2001 From: Trevor Busk <114008066+Tbusk@users.noreply.github.com> Date: Sun, 23 Nov 2025 21:45:35 -0500 Subject: [PATCH 5/5] patch: fix enum and trailing comma codestyle Co-authored-by: Ryo Nakano --- src/Widgets/BatteryBox.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Widgets/BatteryBox.vala b/src/Widgets/BatteryBox.vala index a9b67e7e..2cd7d323 100644 --- a/src/Widgets/BatteryBox.vala +++ b/src/Widgets/BatteryBox.vala @@ -25,7 +25,7 @@ public class Power.BatteryBox : Gtk.Grid { var show_percent_switch = new Gtk.Switch () { halign = END, - valign = Gtk.Align.CENTER, + valign = CENTER }; var show_percent_label = new Granite.HeaderLabel (_("Show Percentage In Panel")) {