[gnome-software] trivial: Use an overlay for the installed label on the app-row

[Richard Hughes <rhughes src gnome org>]

commit b513b2f77ab4a463f3ad6b551e8449cae7ca8770
Author: Richard Hughes <richard hughsie com>
Date:   Thu Jul 14 11:56:52 2016 +0100

    trivial: Use an overlay for the installed label on the app-row
    
    Looks a big patch, but it's really just indenting everything 4 spaces and
    moving an element...

 src/gs-app-row.ui |  417 +++++++++++++++++++++++++++--------------------------
 1 files changed, 215 insertions(+), 202 deletions(-)
---
diff --git a/src/gs-app-row.ui b/src/gs-app-row.ui
index cebef9f..e2de2f0 100644
--- a/src/gs-app-row.ui
+++ b/src/gs-app-row.ui
@@ -7,76 +7,42 @@
       <class name="list-box-app-row"/>
     </style>
     <child>
-      <object class="GtkBox" id="box">
+      <object class="GtkOverlay" id="overlay">
         <property name="visible">True</property>
-        <property name="margin_top">16</property>
-        <property name="margin_bottom">16</property>
-        <property name="orientation">horizontal</property>
-        <child>
-          <object class="GtkCheckButton" id="checkbox">
-            <property name="margin-start">12</property>
-            <property name="valign">center</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkImage" id="image">
-            <property name="visible">True</property>
-            <property name="pixel_size">64</property>
-            <property name="margin_start">24</property>
-            <property name="valign">center</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="name_box">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="margin-start">12</property>
-            <property name="margin-top">3</property>
-            <property name="spacing">0</property>
-            <property name="valign">fill</property>
-            <child>
-              <object class="GtkLabel" id="name_label">
-                <property name="visible">True</property>
-                <property name="wrap">True</property>
-                <property name="max_width_chars">20</property>
-                <property name="xalign">0.0</property>
-                <property name="yalign">0.5</property>
-                <property name="ellipsize">end</property>
-                <property name="lines">3</property>
-                <property name="wrap-mode">word-char</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
+        <property name="halign">fill</property>
+        <property name="valign">fill</property>
+        <child type="overlay">
+          <object class="GtkEventBox" id="label_installed">
+            <property name="no_show_all">True</property>
+            <property name="visible_window">True</property>
+            <property name="halign">end</property>
+            <property name="valign">end</property>
+            <property name="margin-bottom">15</property>
+            <style>
+              <class name="installed-overlay-box"/>
+            </style>
             <child>
-              <object class="GtkLabel" id="version_label">
+              <object class="GtkLabel" id="installed-label">
                 <property name="visible">True</property>
-                <property name="xalign">0.0</property>
-                <property name="yalign">0.5</property>
-                <property name="ellipsize">end</property>
+                <property name="label" translatable="yes">Installed</property>
+                <property name="margin-start">16</property>
+                <property name="margin-end">16</property>
+                <property name="margin-top">4</property>
+                <property name="margin-bottom">4</property>
               </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
             </child>
+          </object>
+        </child>
+        <child>
+          <object class="GtkBox" id="box">
+            <property name="visible">True</property>
+            <property name="margin_top">16</property>
+            <property name="margin_bottom">16</property>
+            <property name="orientation">horizontal</property>
             <child>
-              <object class="GsStarWidget" id="star">
-                <property name="visible">False</property>
-                <property name="halign">start</property>
+              <object class="GtkCheckButton" id="checkbox">
+                <property name="margin-start">12</property>
+                <property name="valign">center</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -84,16 +50,11 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="folder_label">
+              <object class="GtkImage" id="image">
                 <property name="visible">True</property>
-                <property name="margin_top">6</property>
-                <property name="xalign">0.0</property>
-                <property name="yalign">0.5</property>
-                <property name="halign">start</property>
-                <property name="ellipsize">end</property>
-                <style>
-                  <class name="folder-label"/>
-                </style>
+                <property name="pixel_size">64</property>
+                <property name="margin_start">24</property>
+                <property name="valign">center</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -101,23 +62,48 @@
               </packing>
             </child>
             <child>
-              <object class="GtkBox" id="box_sandboxed">
+              <object class="GtkBox" id="name_box">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">horizontal</property>
-                <property name="margin_top">6</property>
-                <property name="spacing">3</property>
-                <property name="halign">start</property>
-                <property name="valign">start</property>
+                <property name="orientation">vertical</property>
+                <property name="margin-start">12</property>
+                <property name="margin-top">3</property>
+                <property name="spacing">0</property>
+                <property name="valign">fill</property>
+                <child>
+                  <object class="GtkLabel" id="name_label">
+                    <property name="visible">True</property>
+                    <property name="wrap">True</property>
+                    <property name="max_width_chars">20</property>
+                    <property name="xalign">0.0</property>
+                    <property name="yalign">0.5</property>
+                    <property name="ellipsize">end</property>
+                    <property name="lines">3</property>
+                    <property name="wrap-mode">word-char</property>
+                    <attributes>
+                      <attribute name="weight" value="bold"/>
+                    </attributes>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
                 <child>
-                  <object class="GtkImage" id="image_sandboxed">
+                  <object class="GtkLabel" id="version_label">
                     <property name="visible">True</property>
-                    <property name="pixel_size">16</property>
-                    <property name="valign">center</property>
+                    <property name="xalign">0.0</property>
+                    <property name="yalign">0.5</property>
+                    <property name="ellipsize">end</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GsStarWidget" id="star">
+                    <property name="visible">False</property>
                     <property name="halign">start</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -125,16 +111,15 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkLabel" id="label_sandboxed">
-                    <property name="label" translatable="yes" comments="security 
sandbox">Sandboxed</property>
+                  <object class="GtkLabel" id="folder_label">
                     <property name="visible">True</property>
+                    <property name="margin_top">6</property>
                     <property name="xalign">0.0</property>
                     <property name="yalign">0.5</property>
                     <property name="halign">start</property>
                     <property name="ellipsize">end</property>
                     <style>
-                      <class name="app-row-origin-text"/>
-                      <class name="dim-label"/>
+                      <class name="folder-label"/>
                     </style>
                   </object>
                   <packing>
@@ -142,99 +127,131 @@
                     <property name="fill">False</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkBox" id="box_sandboxed">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="orientation">horizontal</property>
+                    <property name="margin_top">6</property>
+                    <property name="spacing">3</property>
+                    <property name="halign">start</property>
+                    <property name="valign">start</property>
+                    <child>
+                      <object class="GtkImage" id="image_sandboxed">
+                        <property name="visible">True</property>
+                        <property name="pixel_size">16</property>
+                        <property name="valign">center</property>
+                        <property name="halign">start</property>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="label_sandboxed">
+                        <property name="label" translatable="yes" comments="security 
sandbox">Sandboxed</property>
+                        <property name="visible">True</property>
+                        <property name="xalign">0.0</property>
+                        <property name="yalign">0.5</property>
+                        <property name="halign">start</property>
+                        <property name="ellipsize">end</property>
+                        <style>
+                          <class name="app-row-origin-text"/>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                      </packing>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="fill">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="box_description">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin_top">3</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">3</property>
-            <child>
-              <object class="GtkLabel" id="description_label">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="valign">start</property>
-                <property name="margin_start">24</property>
-                <property name="margin_end">24</property>
-                <property name="wrap">True</property>
-                <property name="wrap-mode">word-char</property>
-                <property name="ellipsize">end</property>
-                <property name="lines">2</property>
-                <property name="xalign">0</property>
-              </object>
-              <packing>
-                <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkBox" id="box_tag">
+              <object class="GtkBox" id="box_description">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="spacing">4</property>
-                <property name="margin_left">24</property>
+                <property name="margin_top">3</property>
                 <property name="orientation">vertical</property>
+                <property name="spacing">3</property>
                 <child>
-                  <object class="GtkLabel" id="label_warning">
+                  <object class="GtkLabel" id="description_label">
+                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label">warning-text</property>
-                    <property name="halign">start</property>
-                    <property name="ellipsize">middle</property>
-                    <attributes>
-                      <attribute name="weight" value="bold"/>
-                      <attribute name="foreground" value="#cccc00000000"/>
-                    </attributes>
+                    <property name="valign">start</property>
+                    <property name="margin_start">24</property>
+                    <property name="margin_end">24</property>
+                    <property name="wrap">True</property>
+                    <property name="wrap-mode">word-char</property>
+                    <property name="ellipsize">end</property>
+                    <property name="lines">2</property>
+                    <property name="xalign">0</property>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
+                    <property name="expand">True</property>
                     <property name="fill">True</property>
-                    <property name="position">3</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkBox" id="box_desc">
+                  <object class="GtkBox" id="box_tag">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="orientation">horizontal</property>
+                    <property name="spacing">4</property>
+                    <property name="margin_left">24</property>
+                    <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkLabel" id="label_origin">
-                        <property name="visible">True</property>
-                        <property name="xalign">0.0</property>
-                        <property name="yalign">1.0</property>
+                      <object class="GtkLabel" id="label_warning">
+                        <property name="can_focus">False</property>
+                        <property name="label">warning-text</property>
                         <property name="halign">start</property>
-                        <property name="ellipsize">end</property>
-                        <style>
-                          <class name="app-row-origin-text"/>
-                          <class name="dim-label"/>
-                        </style>
+                        <property name="ellipsize">middle</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                          <attribute name="foreground" value="#cccc00000000"/>
+                        </attributes>
                       </object>
                       <packing>
-                        <property name="expand">True</property>
+                        <property name="expand">False</property>
                         <property name="fill">True</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkLabel" id="label_installed">
+                      <object class="GtkBox" id="box_desc">
                         <property name="visible">True</property>
-                        <property name="xalign">1.0</property>
-                        <property name="yalign">0.5</property>
-                        <property name="halign">end</property>
-                        <property name="label" translatable="yes" comments="app state">Installed</property>
-                        <style>
-                          <class name="app-row-installed-label"/>
-                        </style>
+                        <property name="can_focus">False</property>
+                        <property name="orientation">horizontal</property>
+                        <child>
+                          <object class="GtkLabel" id="label_origin">
+                            <property name="visible">True</property>
+                            <property name="xalign">0.0</property>
+                            <property name="yalign">1.0</property>
+                            <property name="halign">start</property>
+                            <property name="ellipsize">end</property>
+                            <style>
+                              <class name="app-row-origin-text"/>
+                              <class name="dim-label"/>
+                            </style>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="expand">True</property>
@@ -243,58 +260,59 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
+                    <property name="expand">False</property>
                     <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">False</property>
+                <property name="expand">True</property>
                 <property name="fill">True</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="button_box">
-            <property name="visible">True</property>
-            <property name="orientation">horizontal</property>
-            <property name="halign">end</property>
-            <property name="valign">center</property>
-            <child>
-              <object class="GsProgressButton" id="button">
-                <property name="margin_end">24</property>
-                <property name="width_request">100</property>
-                <property name="halign">end</property>
-              </object>
-              <packing>
-                <property name="pack_type">end</property>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
               </packing>
             </child>
             <child>
-              <object class="GtkSpinner" id="spinner">
-                <property name="margin_start">12</property>
-                <property name="margin_end">12</property>
-                <property name="halign">end</property>
-              </object>
-              <packing>
-                <property name="pack_type">end</property>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label">
-                <property name="margin_start">12</property>
-                <property name="margin_end">12</property>
+              <object class="GtkBox" id="button_box">
+                <property name="visible">True</property>
+                <property name="orientation">horizontal</property>
                 <property name="halign">end</property>
+                <property name="valign">center</property>
+                <child>
+                  <object class="GsProgressButton" id="button">
+                    <property name="margin_end">24</property>
+                    <property name="width_request">100</property>
+                    <property name="halign">end</property>
+                  </object>
+                  <packing>
+                    <property name="pack_type">end</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkSpinner" id="spinner">
+                    <property name="margin_start">12</property>
+                    <property name="margin_end">12</property>
+                    <property name="halign">end</property>
+                  </object>
+                  <packing>
+                    <property name="pack_type">end</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label">
+                    <property name="margin_start">12</property>
+                    <property name="margin_end">12</property>
+                    <property name="halign">end</property>
+                  </object>
+                  <packing>
+                    <property name="pack_type">end</property>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="pack_type">end</property>
@@ -303,11 +321,6 @@
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="pack_type">end</property>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-          </packing>
         </child>
       </object>
     </child>