From be2234835a96601ac7dfffa93bd27a70a02b299e Mon Sep 17 00:00:00 2001
From: fiaxh <git@mx.ax.lt>
Date: Sat, 18 Mar 2017 23:44:05 +0100
Subject: Preselect next conversation when closed and crossfade

---
 main/src/ui/conversation_summary/conversation_item.vala | 2 --
 main/src/ui/conversation_summary/view.vala              | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'main/src/ui/conversation_summary')

diff --git a/main/src/ui/conversation_summary/conversation_item.vala b/main/src/ui/conversation_summary/conversation_item.vala
index 480ccd48..fa91f78e 100644
--- a/main/src/ui/conversation_summary/conversation_item.vala
+++ b/main/src/ui/conversation_summary/conversation_item.vala
@@ -22,10 +22,8 @@ public interface ConversationItem : Gtk.Widget {
         switch (get_message_kind(message)) {
             case MessageKind.TEXT:
                 return new MergedMessageItem(stream_interactor, conversation, message);
-                break;
             case MessageKind.ME_COMMAND:
                 return new SlashMeItem(stream_interactor, conversation, message);
-                break;
         }
         return null;
     }
diff --git a/main/src/ui/conversation_summary/view.vala b/main/src/ui/conversation_summary/view.vala
index d884a04a..33b3a836 100644
--- a/main/src/ui/conversation_summary/view.vala
+++ b/main/src/ui/conversation_summary/view.vala
@@ -15,6 +15,7 @@ public class View : Box {
 
     [GtkChild] private ScrolledWindow scrolled;
     [GtkChild] private Box main;
+    [GtkChild] private Stack stack;
 
     private StreamInteractor stream_interactor;
     private ConversationItem? last_conversation_item;
@@ -56,6 +57,7 @@ public class View : Box {
 
     public void initialize_for_conversation(Conversation? conversation) {
         this.conversation = conversation;
+        stack.set_visible_child_name("void");
         clear();
         conversation_items.clear();
         was_upper = null;
@@ -95,6 +97,7 @@ public class View : Box {
             }
         }
         update_chat_state();
+        stack.set_visible_child_name("main");
     }
 
     private void on_received_state(Account account, Jid jid, string state) {
-- 
cgit v1.2.3-54-g00ecf