From bf5f83c073eb9f8edb5072e6667c2a95d0539c7a Mon Sep 17 00:00:00 2001
From: Michel Le Bihan <michel@lebihan.pl>
Date: Fri, 15 Jan 2021 13:16:10 +0100
Subject: [PATCH] Change select contact dialog container to HdyClamp and set
 default size (#949)

---
 .../add_conversation/select_jid_fragment.ui   | 100 ++++++++++--------
 .../add_conference_dialog.vala                |   2 +
 .../select_contact_dialog.vala                |   2 +
 3 files changed, 57 insertions(+), 47 deletions(-)

diff --git a/main/data/add_conversation/select_jid_fragment.ui b/main/data/add_conversation/select_jid_fragment.ui
index 50bc0e36..be56e710 100644
--- a/main/data/add_conversation/select_jid_fragment.ui
+++ b/main/data/add_conversation/select_jid_fragment.ui
@@ -1,82 +1,88 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
     <template class="DinoUiSelectJidFragment">
-        <property name="height_request">500</property>
-        <property name="width_request">460</property>
+        <property name="height_request">480</property>
         <property name="visible">True</property>
         <child>
-            <object class="GtkGrid">
-                <property name="expand">True</property>
-                <property name="margin-top">20</property>
-                <property name="margin-right">80</property>
-                <property name="margin-bottom">20</property>
-                <property name="margin-left">80</property>
-                <property name="orientation">vertical</property>
-                <property name="row-spacing">10</property>
+            <object class="HdyClamp">
+                <property name="margin-right">18</property>
+                <property name="margin-left">18</property>
+                <property name="maximum-size">300</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
-                    <object class="GtkEntry" id="entry">
-                        <property name="activates_default">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="visible">True</property>
-                    </object>
-                </child>
-                <child>
-                    <object class="GtkBox">
+                    <object class="GtkGrid">
                         <property name="expand">True</property>
+                        <property name="margin-top">20</property>
+                        <property name="margin-bottom">20</property>
                         <property name="orientation">vertical</property>
+                        <property name="row-spacing">10</property>
                         <property name="visible">True</property>
                         <child>
-                            <object class="GtkFrame">
+                            <object class="GtkEntry" id="entry">
+                                <property name="activates_default">True</property>
+                                <property name="hexpand">True</property>
+                                <property name="visible">True</property>
+                            </object>
+                        </child>
+                        <child>
+                            <object class="GtkBox">
+                                <property name="expand">True</property>
+                                <property name="orientation">vertical</property>
                                 <property name="visible">True</property>
                                 <child>
-                                    <object class="GtkScrolledWindow" id="scrolled_window">
-                                        <property name="hscrollbar_policy">never</property>
-                                        <property name="expand">True</property>
+                                    <object class="GtkFrame">
                                         <property name="visible">True</property>
                                         <child>
-                                            <object class="GtkBox" id="box">
-                                                <property name="orientation">vertical</property>
+                                            <object class="GtkScrolledWindow" id="scrolled_window">
+                                                <property name="hscrollbar_policy">never</property>
+                                                <property name="expand">True</property>
                                                 <property name="visible">True</property>
+                                                <child>
+                                                    <object class="GtkBox" id="box">
+                                                        <property name="orientation">vertical</property>
+                                                        <property name="visible">True</property>
+                                                    </object>
+                                                </child>
                                             </object>
                                         </child>
                                     </object>
                                 </child>
-                            </object>
-                        </child>
-                        <child>
-                            <object class="GtkToolbar">
-                                <property name="visible">True</property>
-                                <style>
-                                    <class name="inline-toolbar"/>
-                                </style>
                                 <child>
-                                    <object class="GtkToolItem">
+                                    <object class="GtkToolbar">
                                         <property name="visible">True</property>
+                                        <style>
+                                            <class name="inline-toolbar"/>
+                                        </style>
                                         <child>
-                                            <object class="GtkBox">
+                                            <object class="GtkToolItem">
                                                 <property name="visible">True</property>
                                                 <child>
-                                                    <object class="GtkButton" id="add_button">
+                                                    <object class="GtkBox">
                                                         <property name="visible">True</property>
                                                         <child>
-                                                            <object class="GtkImage">
-                                                                <property name="icon-name">list-add-symbolic</property>
-                                                                <property name="icon-size">1</property>
+                                                            <object class="GtkButton" id="add_button">
                                                                 <property name="visible">True</property>
+                                                                <child>
+                                                                    <object class="GtkImage">
+                                                                        <property name="icon-name">list-add-symbolic</property>
+                                                                        <property name="icon-size">1</property>
+                                                                        <property name="visible">True</property>
+                                                                    </object>
+                                                                </child>
                                                             </object>
                                                         </child>
-                                                    </object>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkButton" id="remove_button">
-                                                        <property name="sensitive">False</property>
-                                                        <property name="visible">True</property>
                                                         <child>
-                                                            <object class="GtkImage">
-                                                                <property name="icon-name">list-remove-symbolic</property>
-                                                                <property name="icon-size">1</property>
+                                                            <object class="GtkButton" id="remove_button">
+                                                                <property name="sensitive">False</property>
                                                                 <property name="visible">True</property>
+                                                                <child>
+                                                                    <object class="GtkImage">
+                                                                        <property name="icon-name">list-remove-symbolic</property>
+                                                                        <property name="icon-size">1</property>
+                                                                        <property name="visible">True</property>
+                                                                    </object>
+                                                                </child>
                                                             </object>
                                                         </child>
                                                     </object>
diff --git a/main/src/ui/add_conversation/add_conference_dialog.vala b/main/src/ui/add_conversation/add_conference_dialog.vala
index a03f3db6..dfe877ec 100644
--- a/main/src/ui/add_conversation/add_conference_dialog.vala
+++ b/main/src/ui/add_conversation/add_conference_dialog.vala
@@ -35,6 +35,8 @@ public class AddConferenceDialog : Gtk.Dialog {
         setup_jid_add_view();
         setup_conference_details_view();
         show_jid_add_view();
+
+        set_default_size(400, 520);
     }
 
     private void show_jid_add_view() {
diff --git a/main/src/ui/add_conversation/select_contact_dialog.vala b/main/src/ui/add_conversation/select_contact_dialog.vala
index d78a17c1..6be7cf3b 100644
--- a/main/src/ui/add_conversation/select_contact_dialog.vala
+++ b/main/src/ui/add_conversation/select_contact_dialog.vala
@@ -27,6 +27,8 @@ public class SelectContactDialog : Gtk.Dialog {
 
         setup_view();
         setup_headerbar();
+
+        set_default_size(400, 520);
     }
 
     public void set_filter(string str) {