Skip to content

ConversationList: gtk4 prep #1091

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

Closed
danirabbit wants to merge 1 commit into from
Closed

ConversationList: gtk4 prep #1091

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 32 additions & 28 deletions src/ConversationList/ConversationList.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,32 +51,6 @@ public class Mail.ConversationList : Gtk.Box {
folders = new Gee.HashMap<string, Camel.Folder> ();
folder_info_flags = new Gee.HashMap<string, Camel.FolderInfoFlags> ();
threads = new Gee.HashMap<string, Camel.FolderThread> ();
list_store = new ConversationListStore ();
list_store.set_sort_func (thread_sort_function);
list_store.set_filter_func (filter_function);

list_box = new VirtualizingListBox () {
activate_on_single_click = true,
model = list_store,
selection_mode = SINGLE
};
list_box.factory_func = (item, old_widget) => {
ConversationListItem? row = null;
if (old_widget != null) {
row = old_widget as ConversationListItem;
} else {
row = new ConversationListItem ();
row.select.connect (() => {
if (list_box.selected_row_widget != row) {
list_box.select_row (row);
}
});
}

row.assign ((ConversationItemModel)item);
row.show_all ();
return row;
};

var application_instance = (Gtk.Application) GLib.Application.get_default ();

Expand Down Expand Up @@ -114,10 +88,39 @@ public class Mail.ConversationList : Gtk.Box {
search_header.pack_end (filter_button);
search_header.get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);

list_store = new ConversationListStore ();
list_store.set_sort_func (thread_sort_function);
list_store.set_filter_func (filter_function);

VirtualizingListBox.RowFactoryMethod factory = (item, old_widget) => {
ConversationListItem? row = null;
if (old_widget != null) {
row = old_widget as ConversationListItem;
} else {
row = new ConversationListItem ();
row.select.connect (() => {
if (list_box.selected_row_widget != row) {
list_box.select_row (row);
}
});
}

row.assign ((ConversationItemModel)item);
row.show_all ();
return row;
};

list_box = new VirtualizingListBox (factory) {
activate_on_single_click = true,
model = list_store,
selection_mode = SINGLE
};

var scrolled_window = new Gtk.ScrolledWindow (null, null) {
hscrollbar_policy = Gtk.PolicyType.NEVER,
hscrollbar_policy = NEVER,
width_request = 158,
expand = true,
hexpand = true,
vexpand = true,
child = list_box
};

Expand Down Expand Up @@ -191,6 +194,7 @@ public class Mail.ConversationList : Gtk.Box {
((SimpleAction) win_action_map.lookup_action (MainWindow.ACTION_MARK_UNREAD)).set_enabled (!((ConversationItemModel) row).unread);
((SimpleAction) win_action_map.lookup_action (MainWindow.ACTION_MARK_STAR)).set_enabled (!((ConversationItemModel) row).flagged);
((SimpleAction) win_action_map.lookup_action (MainWindow.ACTION_MARK_UNSTAR)).set_enabled (((ConversationItemModel) row).flagged);

conversation_selected (((ConversationItemModel) row).node);
}
});
Expand Down
6 changes: 5 additions & 1 deletion src/VirtualizingListBox/VirtualizingListBox.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
public class VirtualizingListBox : Gtk.Container, Gtk.Scrollable {
public delegate VirtualizingListBoxRow RowFactoryMethod (GLib.Object item, VirtualizingListBoxRow? old_widget);

public RowFactoryMethod factory_func;
public unowned RowFactoryMethod factory_func;

public signal void row_activated (GLib.Object row);
public signal void row_selected (GLib.Object row);
Expand Down Expand Up @@ -120,6 +120,10 @@ public class VirtualizingListBox : Gtk.Container, Gtk.Scrollable {
private VirtualizingListBoxRow? active_row;
private Gtk.GestureMultiPress multipress;

public VirtualizingListBox (RowFactoryMethod factory_func) {
this.factory_func = factory_func;
}

static construct {
set_css_name ("list");
}
Expand Down