From c24dcda90e347b6e53fde8fab96c0907c64b26b3 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 29 Nov 2025 14:19:50 +0900 Subject: [PATCH 1/8] Replace deprecated STYLE_CLASS_DIM_LABEL with CssClass.DIM --- src/Permissions/Widgets/PermissionSettingsWidget.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Permissions/Widgets/PermissionSettingsWidget.vala b/src/Permissions/Widgets/PermissionSettingsWidget.vala index c65bfb03..b906cd21 100644 --- a/src/Permissions/Widgets/PermissionSettingsWidget.vala +++ b/src/Permissions/Widgets/PermissionSettingsWidget.vala @@ -48,7 +48,7 @@ public class Permissions.Widgets.PermissionSettingsWidget : Gtk.ListBoxRow { wrap = true, xalign = 0 }; - description_label.add_css_class (Granite.STYLE_CLASS_DIM_LABEL); + description_label.add_css_class (Granite.CssClass.DIM); description_label.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL); var allow_switch = new Gtk.Switch () { From 75b373cfec76d12bc0e2b293f0e041330ad2af9f Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 29 Nov 2025 14:19:59 +0900 Subject: [PATCH 2/8] Replace deprecated STYLE_CLASS_SMALL_LABEL with CssClass.SMALL --- src/Permissions/Widgets/PermissionSettingsWidget.vala | 2 +- src/Permissions/Widgets/SidebarRow.vala | 2 +- src/Startup/Widgets/AppChooserRow.vala | 2 +- src/Startup/Widgets/AppRow.vala | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Permissions/Widgets/PermissionSettingsWidget.vala b/src/Permissions/Widgets/PermissionSettingsWidget.vala index b906cd21..8cbd989f 100644 --- a/src/Permissions/Widgets/PermissionSettingsWidget.vala +++ b/src/Permissions/Widgets/PermissionSettingsWidget.vala @@ -49,7 +49,7 @@ public class Permissions.Widgets.PermissionSettingsWidget : Gtk.ListBoxRow { xalign = 0 }; description_label.add_css_class (Granite.CssClass.DIM); - description_label.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL); + description_label.add_css_class (Granite.CssClass.SMALL); var allow_switch = new Gtk.Switch () { focusable = false, diff --git a/src/Permissions/Widgets/SidebarRow.vala b/src/Permissions/Widgets/SidebarRow.vala index 324c68a4..e3b4f614 100644 --- a/src/Permissions/Widgets/SidebarRow.vala +++ b/src/Permissions/Widgets/SidebarRow.vala @@ -45,7 +45,7 @@ public class Permissions.SidebarRow : Gtk.ListBoxRow { valign = Gtk.Align.START, xalign = 0 }; - description_label.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL); + description_label.add_css_class (Granite.CssClass.SMALL); description_revealer = new Gtk.Revealer () { child = description_label diff --git a/src/Startup/Widgets/AppChooserRow.vala b/src/Startup/Widgets/AppChooserRow.vala index 57823e35..e5a5e778 100644 --- a/src/Startup/Widgets/AppChooserRow.vala +++ b/src/Startup/Widgets/AppChooserRow.vala @@ -26,7 +26,7 @@ public class Startup.Widgets.AppChooserRow : Gtk.Grid { xalign = 0, ellipsize = Pango.EllipsizeMode.END }; - app_comment.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL); + app_comment.add_css_class (Granite.CssClass.SMALL); column_spacing = 6; attach (image, 0, 0, 1, 2); diff --git a/src/Startup/Widgets/AppRow.vala b/src/Startup/Widgets/AppRow.vala index a31a55b8..1f067d82 100644 --- a/src/Startup/Widgets/AppRow.vala +++ b/src/Startup/Widgets/AppRow.vala @@ -40,7 +40,7 @@ public class Startup.Widgets.AppRow : Gtk.ListBoxRow { hexpand = true, xalign = 0 }; - app_comment.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL); + app_comment.add_css_class (Granite.CssClass.SMALL); var remove_button = new Gtk.Button.from_icon_name ("edit-delete-symbolic") { tooltip_text = _("Remove this app from startup") From 4c34cd3f56c7417be8e3d44294908313ddadb3a4 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 29 Nov 2025 14:26:10 +0900 Subject: [PATCH 3/8] Replace deprecated STYLE_CLASS_H3_LABEL with HeaderLabel.Size.H3 --- src/Permissions/Widgets/SidebarRow.vala | 8 +++----- src/Sidebar.vala | 6 ++---- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/Permissions/Widgets/SidebarRow.vala b/src/Permissions/Widgets/SidebarRow.vala index e3b4f614..785bb8b3 100644 --- a/src/Permissions/Widgets/SidebarRow.vala +++ b/src/Permissions/Widgets/SidebarRow.vala @@ -33,12 +33,10 @@ public class Permissions.SidebarRow : Gtk.ListBoxRow { pixel_size = 32 }; - var title_label = new Gtk.Label (app.name) { - ellipsize = Pango.EllipsizeMode.END, - valign = Gtk.Align.END, - xalign = 0 + var title_label = new Granite.HeaderLabel (app.name) { + size = H3, + valign = Gtk.Align.END }; - title_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL); description_label = new Gtk.Label ("") { ellipsize = Pango.EllipsizeMode.END, diff --git a/src/Sidebar.vala b/src/Sidebar.vala index b91bc7ab..b7dbcf8a 100644 --- a/src/Sidebar.vala +++ b/src/Sidebar.vala @@ -174,11 +174,9 @@ public class Applications.Sidebar : Gtk.Box { icon_size = LARGE }; - var title_label = new Gtk.Label (label) { - ellipsize = END, - xalign = 0 + var title_label = new Granite.HeaderLabel (label) { + size = H3 }; - title_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL); var box = new Gtk.Box (HORIZONTAL, 6); box.append (image); From 4477c4bc87ac4e3d38a18a1924498c7681b6ac53 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 29 Nov 2025 14:38:43 +0900 Subject: [PATCH 4/8] Replace with single Granite.HeaderLabel --- src/Permissions/Widgets/SidebarRow.vala | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/src/Permissions/Widgets/SidebarRow.vala b/src/Permissions/Widgets/SidebarRow.vala index 785bb8b3..6d6c1d3d 100644 --- a/src/Permissions/Widgets/SidebarRow.vala +++ b/src/Permissions/Widgets/SidebarRow.vala @@ -21,8 +21,7 @@ public class Permissions.SidebarRow : Gtk.ListBoxRow { public Permissions.Backend.App app { get; construct; } - private Gtk.Label description_label; - private Gtk.Revealer description_revealer; + private Granite.HeaderLabel title_label; public SidebarRow (Permissions.Backend.App app) { Object (app: app); @@ -33,20 +32,9 @@ public class Permissions.SidebarRow : Gtk.ListBoxRow { pixel_size = 32 }; - var title_label = new Granite.HeaderLabel (app.name) { + title_label = new Granite.HeaderLabel (app.name) { size = H3, - valign = Gtk.Align.END - }; - - description_label = new Gtk.Label ("") { - ellipsize = Pango.EllipsizeMode.END, - valign = Gtk.Align.START, - xalign = 0 - }; - description_label.add_css_class (Granite.CssClass.SMALL); - - description_revealer = new Gtk.Revealer () { - child = description_label + valign = START }; var grid = new Gtk.Grid () { @@ -54,7 +42,6 @@ public class Permissions.SidebarRow : Gtk.ListBoxRow { }; grid.attach (image, 0, 0, 1, 2); grid.attach (title_label, 1, 0); - grid.attach (description_revealer, 1, 1); accessible_role = TAB; child = grid; @@ -80,14 +67,14 @@ public class Permissions.SidebarRow : Gtk.ListBoxRow { if (current_permissions.length > 0) { /// Translators: This is a delimiter that separates types of permissions in the sidebar description var description = string.joinv (_(", "), current_permissions.data); - description_label.label = description; - description_revealer.reveal_child = true; + title_label.secondary_text = description; tooltip_text = description; update_property (Gtk.AccessibleProperty.DESCRIPTION, description, -1); } else { - description_revealer.reveal_child = false; + title_label.secondary_text = ""; tooltip_text = null; + update_property (Gtk.AccessibleProperty.DESCRIPTION, null, -1); } } From 9c75f11a666f889a957c13f6d85c6f66a586111a Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 29 Nov 2025 14:42:32 +0900 Subject: [PATCH 5/8] Require granite-7 >= 7.7.0 --- README.md | 2 +- src/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8cef0031..6aa0a420 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ You'll need the following dependencies: * libadwaita-1-dev * libswitchboard-3-dev * libflatpak-dev -* libgranite-7-dev >= 7.4.0 +* libgranite-7-dev >= 7.7.0 * libgtk-4-dev * meson * valac diff --git a/src/meson.build b/src/meson.build index 1dca946b..0fa75f11 100644 --- a/src/meson.build +++ b/src/meson.build @@ -36,7 +36,7 @@ shared_module( dependency('glib-2.0', version: '>=2.34'), dependency('gio-2.0'), dependency('gobject-2.0'), - dependency('granite-7', version: '>=7.4.0'), + dependency('granite-7', version: '>=7.7.0'), dependency('gtk4'), dependency('libadwaita-1', version: '>=1.4'), switchboard_dep From 14279380f829875d7057a203c89039df7913cb78 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 13 Dec 2025 04:12:28 +0900 Subject: [PATCH 6/8] Use Granite.HeaderLabel.ellipsize --- src/Permissions/Widgets/SidebarRow.vala | 3 ++- src/meson.build | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Permissions/Widgets/SidebarRow.vala b/src/Permissions/Widgets/SidebarRow.vala index 6d6c1d3d..b0d19116 100644 --- a/src/Permissions/Widgets/SidebarRow.vala +++ b/src/Permissions/Widgets/SidebarRow.vala @@ -34,7 +34,8 @@ public class Permissions.SidebarRow : Gtk.ListBoxRow { title_label = new Granite.HeaderLabel (app.name) { size = H3, - valign = START + valign = START, + ellipsize = END }; var grid = new Gtk.Grid () { diff --git a/src/meson.build b/src/meson.build index 0fa75f11..3fe46286 100644 --- a/src/meson.build +++ b/src/meson.build @@ -36,6 +36,7 @@ shared_module( dependency('glib-2.0', version: '>=2.34'), dependency('gio-2.0'), dependency('gobject-2.0'), + # TODO Require >= 7.8.0 when released dependency('granite-7', version: '>=7.7.0'), dependency('gtk4'), dependency('libadwaita-1', version: '>=1.4'), From cc891ef57d4296f68848a63f3db99df5d9d84fb2 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Fri, 19 Dec 2025 06:53:35 +0900 Subject: [PATCH 7/8] Require granite-7 >= 7.8.0 --- README.md | 2 +- src/meson.build | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5c49005e..d45bcc57 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ You'll need the following dependencies: * libadwaita-1-dev * libswitchboard-3-dev * libflatpak-dev -* libgranite-7-dev >= 7.7.0 +* libgranite-7-dev >= 7.8.0 * libgtk-4-dev * meson >= 0.58.0 * valac diff --git a/src/meson.build b/src/meson.build index fd71e3e0..f8f759f5 100644 --- a/src/meson.build +++ b/src/meson.build @@ -36,8 +36,7 @@ shared_module( dependency('glib-2.0', version: '>=2.34'), dependency('gio-2.0'), dependency('gobject-2.0'), - # TODO Require >= 7.8.0 when released - dependency('granite-7', version: '>=7.7.0'), + dependency('granite-7', version: '>=7.8.0'), dependency('gtk4'), dependency('libadwaita-1', version: '>=1.4'), switchboard_dep From b628a75f0df33cd9ffafe5acfd5378165d65b025 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Fri, 19 Dec 2025 21:14:12 +0900 Subject: [PATCH 8/8] Use only one row --- src/Permissions/Widgets/SidebarRow.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Permissions/Widgets/SidebarRow.vala b/src/Permissions/Widgets/SidebarRow.vala index b0d19116..07cb9df6 100644 --- a/src/Permissions/Widgets/SidebarRow.vala +++ b/src/Permissions/Widgets/SidebarRow.vala @@ -41,7 +41,7 @@ public class Permissions.SidebarRow : Gtk.ListBoxRow { var grid = new Gtk.Grid () { column_spacing = 6 }; - grid.attach (image, 0, 0, 1, 2); + grid.attach (image, 0, 0); grid.attach (title_label, 1, 0); accessible_role = TAB;