From 28c44380ba89e51c5aeac01ca9549633fbeb7e11 Mon Sep 17 00:00:00 2001
From: fiaxh <git@lightrise.org>
Date: Fri, 21 Feb 2020 02:11:23 +0100
Subject: Move ConversationContentView+ChatInput into ConversationView, handle
 drag'n'drop on ConversationView level

---
 main/data/conversation_view.ui    | 54 +++++++++++++++++++++++++++++++++++++++
 main/data/unified_main_content.ui | 49 +----------------------------------
 2 files changed, 55 insertions(+), 48 deletions(-)
 create mode 100644 main/data/conversation_view.ui

(limited to 'main/data')

diff --git a/main/data/conversation_view.ui b/main/data/conversation_view.ui
new file mode 100644
index 00000000..df9df7e0
--- /dev/null
+++ b/main/data/conversation_view.ui
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+    <template class="DinoUiConversationView" parent="GtkBox">
+            <property name="orientation">vertical</property>
+            <property name="visible">True</property>
+            <style>
+                <class name="dino-conversation"/>
+            </style>
+            <child>
+                <object class="GtkOverlay">
+                    <property name="visible">True</property>
+                    <child>
+                <object class="DinoUiConversationSummaryConversationView" id="conversation_frame">
+                    <property name="visible">True</property>
+                </object>
+                    </child>
+                    <child type="overlay">
+                        <object class="GtkRevealer" id="goto_end_revealer">
+                            <property name="halign">end</property>
+                            <property name="valign">end</property>
+                            <property name="transition-type">crossfade</property>
+                            <property name="visible">True</property>
+                            <property name="margin-end">30</property>
+                            <property name="margin-bottom">30</property>
+                            <child>
+                                <object class="GtkButton" id="goto_end_button">
+                                    <property name="vexpand">False</property>
+                                    <property name="halign">end</property>
+                                    <property name="valign">end</property>
+                                    <property name="visible">True</property>
+                                    <style>
+                                        <class name="circular"/>
+                                    </style>
+                                    <child>
+                                        <object class="GtkImage">
+                                            <property name="icon-name">go-down-symbolic</property>
+                                            <property name="icon-size">1</property>
+                                            <property name="visible">True</property>
+                                        </object>
+                                    </child>
+                                </object>
+                            </child>
+                        </object>
+
+                    </child>
+                </object>
+            </child>
+            <child>
+                <object class="DinoUiChatInputView" id="chat_input">
+                    <property name="visible">True</property>
+                </object>
+            </child>
+    </template>
+</interface>
diff --git a/main/data/unified_main_content.ui b/main/data/unified_main_content.ui
index 25faf0fa..03c206c1 100644
--- a/main/data/unified_main_content.ui
+++ b/main/data/unified_main_content.ui
@@ -69,55 +69,8 @@
                     <object class="GtkStack" id="right_stack">
                         <property name="visible">True</property>
                         <child>
-                            <object class="GtkOverlay">
+                            <object class="DinoUiConversationView" id="conversation_view">
                                 <property name="visible">True</property>
-                                <child>
-                                    <object class="GtkBox">
-                                        <property name="orientation">vertical</property>
-                                        <property name="visible">True</property>
-                                        <style>
-                                            <class name="dino-conversation"/>
-                                        </style>
-                                        <child>
-                                            <object class="DinoUiConversationSummaryConversationView" id="conversation_frame">
-                                                <property name="visible">True</property>
-                                            </object>
-                                        </child>
-                                        <child>
-                                            <object class="DinoUiChatInputView" id="chat_input">
-                                                <property name="visible">True</property>
-                                            </object>
-                                        </child>
-                                    </object>
-                                </child>
-                                <child type="overlay">
-                                    <object class="GtkRevealer" id="goto_end_revealer">
-                                        <property name="halign">end</property>
-                                        <property name="valign">end</property>
-                                        <property name="transition-type">crossfade</property>
-                                        <property name="visible">True</property>
-                                        <property name="margin-end">30</property>
-                                        <property name="margin-bottom">70</property>
-                                        <child>
-                                            <object class="GtkButton" id="goto_end_button">
-                                                <property name="vexpand">False</property>
-                                                <property name="halign">end</property>
-                                                <property name="valign">end</property>
-                                                <property name="visible">True</property>
-                                                <style>
-                                                    <class name="circular"/>
-                                                </style>
-                                                <child>
-                                                    <object class="GtkImage">
-                                                        <property name="icon-name">go-down-symbolic</property>
-                                                        <property name="icon-size">1</property>
-                                                        <property name="visible">True</property>
-                                                    </object>
-                                                </child>
-                                            </object>
-                                        </child>
-                                    </object>
-                                </child>
                             </object>
                             <packing>
                                 <property name="name">content</property>
-- 
cgit v1.2.3-54-g00ecf