From af49a47cf6c5933a9bcc21f2b7bb20d85be37483 Mon Sep 17 00:00:00 2001
From: fiaxh <git@mx.ax.lt>
Date: Wed, 15 Mar 2017 22:01:32 +0100
Subject: Fix ChatInput for many lines + small UI changes

---
 main/data/chat_input.ui                             | 12 +++++++-----
 main/data/conversation_selector/conversation_row.ui |  3 ---
 main/data/conversation_selector/view.ui             |  1 -
 main/data/occupant_list.ui                          |  1 +
 main/data/occupant_list_item.ui                     |  5 ++---
 5 files changed, 10 insertions(+), 12 deletions(-)

(limited to 'main/data')

diff --git a/main/data/chat_input.ui b/main/data/chat_input.ui
index dac75feb..18583d07 100644
--- a/main/data/chat_input.ui
+++ b/main/data/chat_input.ui
@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-    <template class="DinoUiChatInput" parent="GtkGrid"> <!-- TODO -->
+    <requires lib="gtk+" version="3.22"/>
+    <template class="DinoUiChatInput">
         <property name="hexpand">True</property>
         <property name="orientation">horizontal</property>
-        <property name="visible">True</property>
         <property name="margin">5</property>
-        <property name="column-spacing">5</property>
+        <property name="visible">True</property>
         <child>
-            <object class="GtkFrame">
+            <object class="GtkScrolledWindow" id="scrolled">
+                <property name="max_content_height">300</property>
+                <property name="propagate_natural_height">True</property>
                 <child>
                     <object class="GtkTextView" id="text_input">
-                        <property name="border-width">5</property>
                         <property name="wrap-mode">GTK_WRAP_WORD_CHAR</property>
+                        <property name="border-width">5</property>
                         <property name="can_focus">True</property>
                         <property name="hexpand">True</property>
                         <property name="visible">True</property>
diff --git a/main/data/conversation_selector/conversation_row.ui b/main/data/conversation_selector/conversation_row.ui
index a932ed85..d37d8d4e 100644
--- a/main/data/conversation_selector/conversation_row.ui
+++ b/main/data/conversation_selector/conversation_row.ui
@@ -2,9 +2,6 @@
 <interface>
     <template class="DinoUiConversationSelectorConversationRow">
         <property name="visible">True</property>
-        <style>
-            <class name="no_padding"/>
-        </style>
         <child>
             <object class="GtkRevealer" id="main_revealer">
                 <property name="transition-type">slide-down</property>
diff --git a/main/data/conversation_selector/view.ui b/main/data/conversation_selector/view.ui
index 0dd2d00f..72ef268b 100644
--- a/main/data/conversation_selector/view.ui
+++ b/main/data/conversation_selector/view.ui
@@ -2,7 +2,6 @@
 <interface>
     <template class="DinoUiConversationSelectorView">
         <property name="can_focus">True</property>
-        <property name="width_request">40</property>
         <property name="expand">True</property>
         <property name="orientation">vertical</property>
         <property name="visible">True</property>
diff --git a/main/data/occupant_list.ui b/main/data/occupant_list.ui
index 60fb2dac..384d9033 100644
--- a/main/data/occupant_list.ui
+++ b/main/data/occupant_list.ui
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+    <requires lib="gtk+" version="3.22"/>
     <template class="DinoUiOccupantList">
         <property name="visible">True</property>
         <child>
diff --git a/main/data/occupant_list_item.ui b/main/data/occupant_list_item.ui
index 34f4107f..7a37f73b 100644
--- a/main/data/occupant_list_item.ui
+++ b/main/data/occupant_list_item.ui
@@ -21,12 +21,11 @@
                         <property name="visible">True</property>
                         <child>
                             <object class="GtkLabel" id="name_label">
+                                <property name="max_width_chars">1</property>
+                                <property name="ellipsize">end</property>
                                 <property name="expand">True</property>
                                 <property name="xalign">0</property>
                                 <property name="visible">True</property>
-                                <style>
-                                    <class name="name"/>
-                                </style>
                             </object>
                             <packing>
                                 <property name="left_attach">0</property>
-- 
cgit v1.2.3-54-g00ecf