From 5e607f85b544f5d7b2d34e287df0ed3afc19def1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Thu, 22 Jan 2026 09:05:38 -0800 Subject: [PATCH 1/4] Use Granite.BackButton --- src/Widgets/VariantWidget.vala | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Widgets/VariantWidget.vala b/src/Widgets/VariantWidget.vala index b64c1026..58074d36 100644 --- a/src/Widgets/VariantWidget.vala +++ b/src/Widgets/VariantWidget.vala @@ -38,14 +38,13 @@ public class VariantWidget : Gtk.Frame { vexpand = true }; - var back_button = new Gtk.Button.with_label (main_page.title) { + var back_button = new Granite.BackButton (main_page.title) { halign = START, margin_top = 6, margin_end = 6, margin_bottom = 6, margin_start = 6 }; - back_button.add_css_class (Granite.STYLE_CLASS_BACK_BUTTON); var variant_title = new Gtk.Label ("") { hexpand = true, From 1f43e077f82213522f8f70f4537af33d44238709 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Thu, 22 Jan 2026 09:06:27 -0800 Subject: [PATCH 2/4] Bump copyright year --- src/Widgets/VariantWidget.vala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Widgets/VariantWidget.vala b/src/Widgets/VariantWidget.vala index 58074d36..cb4d6dfa 100644 --- a/src/Widgets/VariantWidget.vala +++ b/src/Widgets/VariantWidget.vala @@ -1,6 +1,6 @@ /* * SPDX-License-Identifier: GPL-3.0-or-later - * SPDX-FileCopyrightText: 2017-2023 elementary, Inc. (https://elementary.io) + * SPDX-FileCopyrightText: 2017-2026 elementary, Inc. (https://elementary.io) */ public class VariantWidget : Gtk.Frame { From cd2df6e56695b0ddf0cfc535b646eac6cf47eb39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Thu, 22 Jan 2026 09:09:28 -0800 Subject: [PATCH 3/4] Use ToolbarView --- src/Widgets/VariantWidget.vala | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/src/Widgets/VariantWidget.vala b/src/Widgets/VariantWidget.vala index cb4d6dfa..866d9661 100644 --- a/src/Widgets/VariantWidget.vala +++ b/src/Widgets/VariantWidget.vala @@ -11,7 +11,6 @@ public class VariantWidget : Gtk.Frame { public signal void going_to_main (); - private Gtk.Box variant_box; private Adw.NavigationView navigation_view; private Adw.NavigationPage variant_page; @@ -39,36 +38,32 @@ public class VariantWidget : Gtk.Frame { }; var back_button = new Granite.BackButton (main_page.title) { - halign = START, - margin_top = 6, - margin_end = 6, - margin_bottom = 6, - margin_start = 6 + halign = START }; var variant_title = new Gtk.Label ("") { hexpand = true, justify = CENTER, - margin_end = 6, - margin_start = 6, mnemonic_widget = variant_listbox, wrap = true }; variant_title.add_css_class (Granite.STYLE_CLASS_H4_LABEL); - var header_box = new Gtk.CenterBox () { - start_widget = back_button, - center_widget = variant_title, - hexpand = true + var header_box = new Gtk.HeaderBar () { + hexpand = true, + show_title_buttons = false, + title_widget = variant_title }; + header_box.pack_start (back_button); - variant_box = new Gtk.Box (VERTICAL, 0); - variant_box.add_css_class (Granite.STYLE_CLASS_VIEW); - variant_box.append (header_box); - variant_box.append (new Gtk.Separator (HORIZONTAL)); - variant_box.append (variant_scrolled); + var toolbarview = new Adw.ToolbarView () { + content = variant_scrolled, + top_bar_style = RAISED_BORDER + }; + toolbarview.add_top_bar (header_box); + toolbarview.add_css_class (Granite.STYLE_CLASS_VIEW); - variant_page = new Adw.NavigationPage (variant_box, ""); + variant_page = new Adw.NavigationPage (toolbarview, ""); navigation_view = new Adw.NavigationView (); navigation_view.add (main_page); From 09ef5d14ab024451156a8d1651a9dd763cc0f91d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Thu, 22 Jan 2026 09:10:10 -0800 Subject: [PATCH 4/4] Minor codestyle --- src/Widgets/VariantWidget.vala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Widgets/VariantWidget.vala b/src/Widgets/VariantWidget.vala index 866d9661..644f06b4 100644 --- a/src/Widgets/VariantWidget.vala +++ b/src/Widgets/VariantWidget.vala @@ -28,8 +28,9 @@ public class VariantWidget : Gtk.Frame { var main_page = new Adw.NavigationPage (main_scrolled, main_title); - variant_listbox = new Gtk.ListBox (); - variant_listbox.activate_on_single_click = false; + variant_listbox = new Gtk.ListBox () { + activate_on_single_click = false + }; var variant_scrolled = new Gtk.ScrolledWindow () { child = variant_listbox,