Add conversation search and change window decorations

2 files changed, 18 insertions, 0 deletions

diff --git a/main/src/ui/conversation_selector/conversation_selector.vala b/main/src/ui/conversation_selector/conversation_selector.vala
index 5d88c540..c11eea82 100644
--- a/main/src/ui/conversation_selector/conversation_selector.vala
+++ b/main/src/ui/conversation_selector/conversation_selector.vala
@@ -14,6 +14,7 @@ public class ConversationSelector : Widget {
     ListBox list_box = new ListBox() { hexpand=true };
 
     private StreamInteractor stream_interactor;
+    private string search_text = "";
     private HashMap<Conversation, ConversationSelectorRow> rows = new HashMap<Conversation, ConversationSelectorRow>(Conversation.hash_func, Conversation.equals_func);
 
     public ConversationSelector init(StreamInteractor stream_interactor) {
@@ -37,6 +38,7 @@ public class ConversationSelector : Widget {
     }
 
     construct {
+        list_box.set_filter_func(filter);
         list_box.set_sort_func(sort);
 
         realize.connect(() => {
@@ -52,6 +54,16 @@ public class ConversationSelector : Widget {
         check_widget_leak(this);
     }
 
+    public void set_search_text(string text) {
+        search_text = text.strip().casefold();
+        list_box.invalidate_filter();
+    }
+
+    private bool filter(ListBoxRow list_box_row) {
+        ConversationSelectorRow? row = list_box_row as ConversationSelectorRow;
+        return row != null && (search_text == "" || row.matches_search(search_text));
+    }
+
     public void row_activated(ListBoxRow r) {
         ConversationSelectorRow? row = r as ConversationSelectorRow;
         if (row != null) {
diff --git a/main/src/ui/conversation_selector/conversation_selector_row.vala b/main/src/ui/conversation_selector/conversation_selector_row.vala
index 11107c57..82c96fdc 100644
--- a/main/src/ui/conversation_selector/conversation_selector_row.vala
+++ b/main/src/ui/conversation_selector/conversation_selector_row.vala
@@ -43,6 +43,7 @@ public class ConversationSelectorRow : ListBoxRow {
 
         var display_name_model = stream_interactor.get_module(ContactModels.IDENTITY).get_display_name_model(conversation);
         display_name_model.bind_property("display-name", name_label, "label", BindingFlags.SYNC_CREATE);
+        name_label.notify["label"].connect(changed);
 
         // Set tooltip
         switch (conversation.type_) {
@@ -179,6 +180,11 @@ public class ConversationSelectorRow : ListBoxRow {
         name_label.label = Util.get_conversation_display_name(stream_interactor, conversation);
     }
 
+    public bool matches_search(string search_text) {
+        return name_label.label.casefold().contains(search_text) ||
+               conversation.counterpart.bare_jid.to_string().casefold().contains(search_text);
+    }
+
     private void update_pinned_icon() {
         pinned_image.visible = conversation.pinned != 0;
     }