Skip to content

SettingsSidebarRow: use Granite.HeaderLabel #409

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danirabbit wants to merge 4 commits into
base: main
Choose a base branch
from
Open

SettingsSidebarRow: use Granite.HeaderLabel #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e1004c
SettingsSidebarRow: use Granite.HeaderLabel
danirabbit Nov 3, 2026
aab7784
Remove unused properties
danirabbit Nov 4, 2026
665ae1d
Remove unused properties
danirabbit Nov 4, 2026
7aaa5ae
Merge branch 'main' into danirabbit/settingssidebar-headerlabel
danirabbit Nov 4, 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
10 changes: 1 addition & 9 deletions data/styles/SettingsSidebar.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,7 @@ settingssidebar {

overlay {
// IconSize.LARGE + padding
min-width: calc(32px + #{rem(6px)});
}

overlay:dir(ltr) {
margin-right: rem(6px);
}

overlay:dir(rtl) {
margin-left: rem(6px);
min-width: calc(32px + 0.5rem);
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions lib/SettingsSidebar.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,10 @@ public class Switchboard.SettingsSidebar : Gtk.Widget {
});

listbox.set_header_func ((row, before) => {
var header = ((SettingsSidebarRow) row).header;
var header = ((SettingsSidebarRow) row).page.header;
if (header != null) {
if (before != null) {
var before_header = ((SettingsSidebarRow) before).header;
var before_header = ((SettingsSidebarRow) before).page.header;
if (before_header != null && before_header == header) {
return;
}
Expand Down
70 changes: 15 additions & 55 deletions lib/SettingsSidebarRow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,36 +26,10 @@ private class Switchboard.SettingsSidebarRow : Gtk.ListBoxRow {
}
}

public string? header { get; set; }

public unowned SettingsPage page { get; construct; }

public Icon icon { get; set; }

public string status {
set {
status_label.label = value;
status_label.visible = true;
update_property (Gtk.AccessibleProperty.DESCRIPTION, value, -1);
}
}

public string title {
get {
return _title;
}
set {
_title = value;
title_label.label = value;
update_property (Gtk.AccessibleProperty.LABEL, value, -1);
}
}

private Gtk.Widget display_widget;
private Gtk.Image status_icon;
private Gtk.Label status_label;
private Gtk.Label title_label;
private string _title;

public SettingsSidebarRow (SettingsPage page) {
Object (
Expand All @@ -64,27 +38,19 @@ private class Switchboard.SettingsSidebarRow : Gtk.ListBoxRow {
}

construct {
title_label = new Gtk.Label (page.title) {
ellipsize = Pango.EllipsizeMode.END,
vexpand = true,
xalign = 0
var header_label = new Granite.HeaderLabel (page.title) {
ellipsize = END,
mnemonic_widget = this,
size = H3,
valign = CENTER,
vexpand = true
};
title_label.add_css_class (Granite.STYLE_CLASS_H3_LABEL);

status_icon = new Gtk.Image () {
halign = Gtk.Align.END,
valign = Gtk.Align.END
};

status_label = new Gtk.Label (null) {
use_markup = true,
ellipsize = Pango.EllipsizeMode.END,
vexpand = true,
xalign = 0,
visible = false
};
status_label.add_css_class (Granite.CssClass.SMALL);

if (!page.with_avatar) {
display_widget = new Gtk.Image () {
icon_size = LARGE
Expand All @@ -100,27 +66,21 @@ private class Switchboard.SettingsSidebarRow : Gtk.ListBoxRow {
page.bind_property ("title", display_widget, "text", SYNC_CREATE);
}

var overlay = new Gtk.Overlay ();
overlay.set_child (display_widget);
var overlay = new Gtk.Overlay () {
child = display_widget
};
overlay.add_overlay (status_icon);

var grid = new Gtk.Grid ();
grid.attach (overlay, 0, 0, 1, 2);
grid.attach (title_label, 1, 0);
grid.attach (status_label, 1, 1);
var box = new Granite.Box (HORIZONTAL, HALF);
box.append (overlay);
box.append (header_label);

accessible_role = TAB;
child = grid;
child = box;

header = page.header;
page.bind_property ("icon", this, "icon", BindingFlags.DEFAULT);
page.bind_property ("status", this, "status", BindingFlags.DEFAULT);
page.bind_property ("status", header_label, "secondary-text", BindingFlags.DEFAULT);
page.bind_property ("status-type", this, "status-type", BindingFlags.DEFAULT);
page.bind_property ("title", this, "title", BindingFlags.DEFAULT);

if (page.status != null) {
status = page.status;
}
page.bind_property ("title", header_label, "label", BindingFlags.DEFAULT);

if (page.status_type != SettingsPage.StatusType.NONE) {
status_type = page.status_type;
Expand Down
Loading