[gnome-control-center/benzea/display-freeze-break-request: 2/2] display: Move arrangement instructions outside of view area

[Benjamin Berg <bberg src gnome org>]

commit 1de753b8cbbacc2ad08643d94f4f8f1ad6a54fbe
Author: Benjamin Berg <bberg redhat com>
Date:   Thu Feb 7 14:54:07 2019 +0100

    display: Move arrangement instructions outside of view area
    
    Having the instructions inside can be slightly confusing because
    monitors cannot be moved around in the labels area. Simply moving the
    instructions to be at the top again improves this.
    
    With this change the dialogs UI matchse the old layout morec closely.

 panels/display/cc-display-panel.ui | 50 ++++++++++----------------------------
 1 file changed, 13 insertions(+), 37 deletions(-)
---
diff --git a/panels/display/cc-display-panel.ui b/panels/display/cc-display-panel.ui
index 4695102d0..21e154cb6 100644
--- a/panels/display/cc-display-panel.ui
+++ b/panels/display/cc-display-panel.ui
@@ -173,50 +173,20 @@
                                 <property name="label_xalign">0</property>
                                 <property name="shadow_type">in</property>
                                 <child>
-                                  <object class="GtkBox">
+                                  <object class="GtkAlignment" id="arrangement_bin">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="orientation">vertical</property>
-                                    <property name="spacing">12</property>
                                     <child>
-                                      <object class="GtkAlignment" id="arrangement_bin">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <child>
-                                          <placeholder/>
-                                        </child>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkLabel">
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">False</property>
-                                        <property name="margin_top">12</property>
-                                        <property name="margin_bottom">12</property>
-                                        <property name="label" translatable="yes">Drag displays to match 
your setup.</property>
-                                        <style>
-                                          <class name="dim-label"/>
-                                        </style>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">2</property>
-                                      </packing>
+                                      <placeholder/>
                                     </child>
-                                    <style>
-                                      <class name="view"/>
-                                    </style>
                                   </object>
                                 </child>
                                 <child type="label_item">
                                   <placeholder/>
                                 </child>
+                                <style>
+                                  <class name="view"/>
+                                </style>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -258,8 +228,14 @@
                             </child>
                           </object>
                         </child>
-                        <child type="label_item">
-                          <placeholder/>
+                        <child type="label">
+                          <object class="GtkLabel">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Drag displays to match your physical 
display setup. Select a display to change its settings.</property>
+                            <property name="wrap">True</property>
+                            <property name="margin_bottom">12</property>
+                          </object>
                         </child>
                         <child internal-child="accessible">
                           <object class="AtkObject" id="frame_arrangement-atkobject">