[fractal] Invite Dialogs: minor visual fixes



commit aa9b48cad3fc4a3f9408e1a707b7b11ffa71a24a
Author: Tobias Bernard <tbernard gnome org>
Date:   Sun Dec 23 01:23:07 2018 +0100

    Invite Dialogs: minor visual fixes
    
    - Fix the search results not expanding
    - Fix the spacing around the searchbar
    
    The two UI files are identical except for some labels and IDs and should
    be merged

 fractal-gtk/res/app.css           |  5 +++++
 fractal-gtk/res/ui/direct_chat.ui |  9 ++++++---
 fractal-gtk/res/ui/invite_user.ui | 13 +++++++------
 3 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/fractal-gtk/res/app.css b/fractal-gtk/res/app.css
index 911aead..01831aa 100644
--- a/fractal-gtk/res/app.css
+++ b/fractal-gtk/res/app.css
@@ -305,3 +305,8 @@ stack.titlebar:not(headerbar) > box > separator {
 .msg-emoji {
   font-size: 3em;
 }
+
+/* the border above the search results in the invite user/new direct message dialogs */
+.scrollarea-top-border {
+  border-top: 1px solid @borders;
+}
diff --git a/fractal-gtk/res/ui/direct_chat.ui b/fractal-gtk/res/ui/direct_chat.ui
index e95edc2..669a19c 100644
--- a/fractal-gtk/res/ui/direct_chat.ui
+++ b/fractal-gtk/res/ui/direct_chat.ui
@@ -18,6 +18,7 @@
       <object class="GtkBox">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
+        <property name="border_width">0</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
             <property name="can_focus">False</property>
@@ -40,12 +41,12 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
             <child>
               <object class="GtkBox" id="to_chat_entry_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
+                <property name="margin">6</property>
                 <child>
                   <object class="GtkScrolledWindow">
                     <property name="visible">True</property>
@@ -82,7 +83,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">never</property>
-                <property name="shadow_type">in</property>
+                <property name="expand">True</property>
+                <style>
+                    <class name="scrollarea-top-border"/>
+                </style>
                 <child>
                   <object class="GtkViewport">
                     <property name="height_request">150</property>
@@ -118,7 +122,6 @@
       <object class="GtkHeaderBar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="can_focus">False</property>
         <property name="title" translatable="yes">New direct chat</property>
         <child>
           <object class="GtkButton" id="cancel_direct_chat">
diff --git a/fractal-gtk/res/ui/invite_user.ui b/fractal-gtk/res/ui/invite_user.ui
index b46327b..7695625 100644
--- a/fractal-gtk/res/ui/invite_user.ui
+++ b/fractal-gtk/res/ui/invite_user.ui
@@ -18,6 +18,7 @@
       <object class="GtkBox">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
+        <property name="border_width">0</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox">
             <property name="can_focus">False</property>
@@ -40,13 +41,13 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
             <child>
               <object class="GtkBox" id="invite_entry_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
-                <child>
+                <property name="margin">6</property>
+               <child>
                   <object class="GtkScrolledWindow">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
@@ -82,7 +83,10 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">never</property>
-                <property name="shadow_type">in</property>
+                <property name="expand">True</property>
+                <style>
+                    <class name="scrollarea-top-border"/>
+                </style>
                 <child>
                   <object class="GtkViewport">
                     <property name="height_request">150</property>
@@ -126,9 +130,6 @@
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
           </object>
-          <packing>
-            <property name="pack_type">start</property>
-          </packing>
         </child>
         <child>
           <object class="GtkButton" id="invite_button">


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]