[gnome-software/1652-search-row-installed-label-breaks-layout-on-the-left: 1/2] gs-app-row: Change packing of widgets in the .ui file

From: Philip Withnall <pwithnall src gnome org>
To: commits-list gnome org
Cc:
Subject: [gnome-software/1652-search-row-installed-label-breaks-layout-on-the-left: 1/2] gs-app-row: Change packing of widgets in the .ui file
Date: Fri, 4 Mar 2022 12:48:58 +0000 (UTC)

commit b6a5d21498c2b91781e025c13db09ecace1a262d
Author: Milan Crha <mcrha redhat com>
Date:   Tue Feb 22 14:27:16 2022 +0100

    gs-app-row: Change packing of widgets in the .ui file
    
    Move the description label below the name label, thus the other
    widgets can be on the right of these two and they can also use
    the whole height of the row.
    
    Closes https://gitlab.gnome.org/GNOME/gnome-software/-/issues/1652

 src/gs-app-row.ui | 207 +++++++++++++++++++++++++++---------------------------
 1 file changed, 104 insertions(+), 103 deletions(-)
---
diff --git a/src/gs-app-row.ui b/src/gs-app-row.ui
index 2a3499a11..1cd2af6a6 100644
--- a/src/gs-app-row.ui
+++ b/src/gs-app-row.ui
@@ -41,6 +41,21 @@
                 </style>
               </object>
             </child>
+            <child>
+              <object class="GtkLabel" id="description_label">
+                <property name="visible" bind-source="GsAppRow" bind-property="show-description" 
bind-flags="sync-create"/>
+                <property name="valign">start</property>
+                <property name="vexpand">True</property>
+                <property name="wrap">False</property>
+                <property name="wrap-mode">word-char</property>
+                <property name="ellipsize">end</property>
+                <property name="lines">2</property>
+                <property name="xalign">0</property>
+                <style>
+                  <class name="subtitle"/>
+                </style>
+              </object>
+            </child>
             <child>
               <object class="GtkBox" id="version_box">
                 <property name="orientation">horizontal</property>
@@ -81,92 +96,21 @@
             </child>
             <child>
               <object class="GtkBox" id="description_box">
-                <property name="orientation">vertical</property>
+                <property name="orientation">horizontal</property>
                 <property name="valign">center</property>
-                <child>
-                  <object class="GtkLabel" id="description_label">
-                    <property name="visible" bind-source="GsAppRow" bind-property="show-description" 
bind-flags="sync-create"/>
-                    <property name="valign">start</property>
-                    <property name="vexpand">True</property>
-                    <property name="wrap">False</property>
-                    <property name="wrap-mode">word-char</property>
-                    <property name="ellipsize">end</property>
-                    <property name="lines">2</property>
-                    <property name="xalign">0</property>
-                    <style>
-                      <class name="subtitle"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkBox" id="box_tag">
-                    <property name="orientation">vertical</property>
-                    <child>
-                      <object class="GtkBox" id="box_desc">
-                        <property name="orientation">horizontal</property>
-                        <property name="vexpand">True</property>
-                        <child>
-                          <object class="GtkLabel" id="label_origin">
-                            <property name="xalign">0.0</property>
-                            <property name="yalign">1.0</property>
-                            <property name="halign">start</property>
-                            <property name="hexpand">True</property>
-                            <property name="ellipsize">end</property>
-                            <style>
-                              <class name="app-row-origin-text"/>
-                              <class name="dim-label"/>
-                              <class name="subtitle"/>
-                            </style>
-                          </object>
-                        </child>
-                       <child>
-                         <object class="GtkBox" id="label_installed">
-                            <property name="visible">False</property>
-                           <property name="orientation">horizontal</property>
-                           <property name="halign">end</property>
-                            <property name="hexpand">True</property>
-                           <property name="valign">end</property>
-                           <property name="spacing">6</property>
-                           <child>
-                             <object class="GtkImage" id="installed-icon">
-                               <property name="halign">center</property>
-                               <property name="valign">center</property>
-                               <property name="pixel-size">16</property>
-                               <property name="icon-name">software-installed-symbolic</property>
-                               <style>
-                                 <class name="accent"/>
-                               </style>
-                             </object>
-                           </child>
-                           <child>
-                             <object class="GtkLabel" id="installed-label">
-                               <property name="valign">center</property>
-                               <property name="label" translatable="yes">Installed</property>
-                               <style>
-                                 <class name="caption"/>
-                                 <class name="subtitle"/>
-                               </style>
-                             </object>
-                           </child>
-                         </object>
-                       </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkLabel" id="label_warning">
-                        <property name="visible">False</property>
-                        <property name="label">warning-text</property>
-                        <property name="halign">start</property>
-                        <property name="wrap">False</property>
-                        <property name="xalign">0</property>
-                        <style>
-                          <class name="title"/>
-                          <class name="warning"/>
-                        </style>
-                      </object>
-                    </child>
-                  </object>
-                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label_warning">
+                <property name="visible">False</property>
+                <property name="label">warning-text</property>
+                <property name="halign">start</property>
+                <property name="wrap">False</property>
+                <property name="xalign">0</property>
+                <style>
+                  <class name="title"/>
+                  <class name="warning"/>
+                </style>
               </object>
             </child>
             <child>
@@ -192,8 +136,8 @@
                 </child>
               </object>
             </child>
-           <child>
-             <object class="GtkLabel" id="label_app_size">
+            <child>
+              <object class="GtkLabel" id="label_app_size">
                 <property name="halign">start</property>
                 <property name="valign">center</property>
                 <property name="vexpand">True</property>
@@ -202,7 +146,7 @@
                   <class name="subtitle"/>
                 </style>
               </object>
-           </child>
+            </child>
             <child>
               <object class="GsStarWidget" id="star">
                 <property name="visible">False</property>
@@ -212,6 +156,63 @@
             </child>
           </object>
         </child>
+        <child>
+          <object class="GtkBox" id="box_tag">
+            <property name="orientation">vertical</property>
+            <property name="valign">center</property>
+            <child>
+              <object class="GtkBox" id="box_desc">
+                <property name="orientation">horizontal</property>
+                <property name="vexpand">True</property>
+                <child>
+                  <object class="GtkLabel" id="label_origin">
+                    <property name="xalign">0.0</property>
+                    <property name="yalign">1.0</property>
+                    <property name="halign">start</property>
+                    <property name="hexpand">True</property>
+                    <property name="ellipsize">end</property>
+                    <style>
+                      <class name="app-row-origin-text"/>
+                      <class name="dim-label"/>
+                      <class name="subtitle"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkBox" id="label_installed">
+                    <property name="visible">False</property>
+                    <property name="orientation">horizontal</property>
+                    <property name="halign">end</property>
+                    <property name="hexpand">True</property>
+                    <property name="valign">end</property>
+                    <property name="spacing">6</property>
+                    <child>
+                      <object class="GtkImage" id="installed-icon">
+                        <property name="halign">center</property>
+                        <property name="valign">center</property>
+                        <property name="pixel-size">16</property>
+                        <property name="icon-name">software-installed-symbolic</property>
+                        <style>
+                          <class name="accent"/>
+                        </style>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkLabel" id="installed-label">
+                        <property name="valign">center</property>
+                        <property name="label" translatable="yes">Installed</property>
+                        <style>
+                          <class name="caption"/>
+                          <class name="subtitle"/>
+                        </style>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+        </child>
         <child>
           <object class="GtkBox" id="vertical_box">
             <property name="orientation">vertical</property>
@@ -219,10 +220,10 @@
             <property name="valign">center</property>
             <child>
               <object class="GtkBox" id="button_box">
-               <property name="orientation">horizontal</property>
-               <property name="halign">end</property>
-               <property name="valign">center</property>
-               <child>
+                <property name="orientation">horizontal</property>
+                <property name="halign">end</property>
+                <property name="valign">center</property>
+                <child>
                   <object class="GtkRevealer" id="button_revealer">
                     <property name="reveal-child">True</property>
                     <child>
@@ -235,27 +236,27 @@
                         </style>
                       </object>
                     </child>
-                 </object>
-               </child>
-               <child>
-                 <object class="GtkSpinner" id="spinner">
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkSpinner" id="spinner">
                     <property name="visible">False</property>
                     <property name="margin_start">12</property>
                     <property name="margin_end">12</property>
                     <property name="halign">end</property>
-                 </object>
-               </child>
-               <child>
-                 <object class="GtkLabel" id="label">
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="label">
                     <property name="visible">False</property>
                     <property name="margin_start">12</property>
                     <property name="margin_end">12</property>
                     <property name="halign">end</property>
-                 </object>
-               </child>
+                  </object>
+                </child>
               </object>
             </child>
-         </object>
+          </object>
         </child>
       </object>
     </child>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]