From 3f6a8581bc2e119be88ddd78d96c318e855c583a Mon Sep 17 00:00:00 2001 From: Michael Gratton Date: Mon, 5 Apr 2021 14:21:36 +1000 Subject: [PATCH] client: Ensure inboxes, account and label branches are expanded by default --- src/client/folder-list/folder-list-account-branch.vala | 5 ++++- src/client/folder-list/folder-list-inboxes-branch.vala | 7 +++++-- src/client/sidebar/sidebar-tree.vala | 3 ++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/client/folder-list/folder-list-account-branch.vala b/src/client/folder-list/folder-list-account-branch.vala index 7b541512..4e67a194 100644 --- a/src/client/folder-list/folder-list-account-branch.vala +++ b/src/client/folder-list/folder-list-account-branch.vala @@ -34,7 +34,10 @@ public class FolderList.AccountBranch : Sidebar.Branch { public AccountBranch(Geary.Account account) { base(new Sidebar.Header(account.information.display_name), - Sidebar.Branch.Options.NONE, normal_folder_comparator, special_folder_comparator); + STARTUP_OPEN_GROUPING | STARTUP_EXPAND_TO_FIRST_CHILD, + normal_folder_comparator, + special_folder_comparator + ); this.account = account; // Translators: The name of the folder group containing diff --git a/src/client/folder-list/folder-list-inboxes-branch.vala b/src/client/folder-list/folder-list-inboxes-branch.vala index e971f402..caf50a3f 100644 --- a/src/client/folder-list/folder-list-inboxes-branch.vala +++ b/src/client/folder-list/folder-list-inboxes-branch.vala @@ -11,8 +11,11 @@ public class FolderList.InboxesBranch : Sidebar.Branch { get; private set; default = new Gee.HashMap(); } public InboxesBranch() { - base(new Sidebar.Header(_("Inboxes")), - Sidebar.Branch.Options.NONE, inbox_comparator); + base( + new Sidebar.Header(_("Inboxes")), + STARTUP_OPEN_GROUPING, + inbox_comparator + ); } private static int inbox_comparator(Sidebar.Entry a, Sidebar.Entry b) { diff --git a/src/client/sidebar/sidebar-tree.vala b/src/client/sidebar/sidebar-tree.vala index 989d8793..4b83ee2c 100644 --- a/src/client/sidebar/sidebar-tree.vala +++ b/src/client/sidebar/sidebar-tree.vala @@ -641,8 +641,9 @@ public class Sidebar.Tree : Gtk.TreeView { associate_entry(insertion_iter, entry); associate_children(branch, entry, insertion_iter); - if (branch.is_auto_open_on_new_child()) + if (branch.is_auto_open_on_new_child() || parent is Grouping) { expand_to_entry(entry); + } } private void on_branch_entry_removed(Sidebar.Branch branch, Sidebar.Entry entry) {