From 0d74083cf87a3f8651d0e86744363a9705c9c734 Mon Sep 17 00:00:00 2001
From: Christopher Davis <christopherdavis@gnome.org>
Date: Sun, 22 Jan 2023 14:21:38 -0500
Subject: [PATCH] propertiesView: Do not propagate natural height

Propagating the height resulted in new window dimensions not
fitting to images.
Use ScrolledWindow instead of PreferencesPage to have
control over propagate-natural-height.
---
 data/gtk/properties_view.ui | 486 ++++++++++++++++++------------------
 1 file changed, 248 insertions(+), 238 deletions(-)

diff --git a/data/gtk/properties_view.ui b/data/gtk/properties_view.ui
index 15e7c35..36890da 100644
--- a/data/gtk/properties_view.ui
+++ b/data/gtk/properties_view.ui
@@ -3,268 +3,278 @@
   <template class="LpPropertiesView" parent="AdwBin">
     <property name="width-request">255</property>
     <property name="child">
-      <object class="AdwPreferencesPage">
-        <child>
-          <object class="AdwPreferencesGroup">
+      <object class="GtkScrolledWindow">
+        <property name="child">
+          <object class="GtkBox">
+            <property name="orientation">vertical</property>
+            <property name="spacing">24</property>
+            <property name="margin-top">24</property>
+            <property name="margin-bottom">24</property>
+            <property name="margin-start">12</property>
+            <property name="margin-end">12</property>
             <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">Folder</property>
-                <property name="activatable-widget">folder_button</property>
-                <binding name="subtitle">
-                  <closure type="gchararray" function="folder_name">
-                    <lookup name="file">LpPropertiesView</lookup>
-                  </closure>
-                </binding>
-                <child type="suffix">
-                  <object class="GtkButton" id="folder_button">
-                    <property name="valign">center</property>
-                    <property name="action-name">properties.open-folder</property>
-                    <property name="icon-name">folder-open-symbolic</property>
-                    <property name="tooltip-text" translatable="yes">Open Containing Folder</property>
+              <object class="AdwPreferencesGroup">
+                <child>
+                  <object class="AdwActionRow">
+                    <property name="title" translatable="yes">Folder</property>
+                    <property name="activatable-widget">folder_button</property>
+                    <binding name="subtitle">
+                      <closure type="gchararray" function="folder_name">
+                        <lookup name="file">LpPropertiesView</lookup>
+                      </closure>
+                    </binding>
+                    <child type="suffix">
+                      <object class="GtkButton" id="folder_button">
+                        <property name="valign">center</property>
+                        <property name="action-name">properties.open-folder</property>
+                        <property name="icon-name">folder-open-symbolic</property>
+                        <property name="tooltip-text" translatable="yes">Open Containing Folder</property>
+                        <style>
+                          <class name="flat"/>
+                        </style>
+                      </object>
+                    </child>
                     <style>
-                      <class name="flat"/>
+                      <class name="property"/>
                     </style>
                   </object>
                 </child>
-                <style>
-                  <class name="property"/>
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="AdwPreferencesGroup">
-            <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">Image Size</property>
-                <binding name="subtitle">
-                  <lookup name="dimensions">LpPropertiesView</lookup>
-                </binding>
-                <style>
-                  <class name="property"/>
-                </style>
               </object>
             </child>
             <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">File Type</property>
-                <binding name="subtitle">
-                  <closure type="gchararray" function="file_type">
-                    <lookup name="file-info">LpPropertiesView</lookup>
-                  </closure>
-                </binding>
-                <style>
-                  <class name="property"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">File Size</property>
-                <binding name="subtitle">
-                  <closure type="gchararray" function="file_size">
-                    <lookup name="file-info">LpPropertiesView</lookup>
-                  </closure>
-                </binding>
-                <style>
-                  <class name="property"/>
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="AdwPreferencesGroup">
-            <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">File Created</property>
-                <binding name="subtitle">
-                  <closure type="gchararray" function="created_date">
-                    <lookup name="file-info">LpPropertiesView</lookup>
-                  </closure>
-                </binding>
-                <style>
-                  <class name="property"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">File Modified</property>
-                <binding name="subtitle">
-                  <closure type="gchararray" function="modified_date">
-                    <lookup name="file-info">LpPropertiesView</lookup>
-                  </closure>
-                </binding>"
-                <style>
-                  <class name="property"/>
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="AdwPreferencesGroup">
-            <binding name="visible">
-              <lookup name="has-information">
-                <lookup name="metadata">LpPropertiesView</lookup>
-              </lookup>
-            </binding>
-            <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">Location</property>
-                <property name="activatable-widget">location_button</property>
-                <binding name="subtitle">
-                  <lookup name="location">
-                    <lookup name="metadata">LpPropertiesView</lookup>
-                  </lookup>
-                </binding>
-                <binding name="visible">
-                  <closure type="gboolean" function="has_content">
-                    <lookup name="location">
-                      <lookup name="metadata">LpPropertiesView</lookup>
-                    </lookup>
-                  </closure>
-                </binding>
-                <child type="suffix">
-                  <object class="GtkButton" id="location_button">
-                    <property name="valign">center</property>
-                    <property name="action-name">properties.open-location</property>
-                    <property name="icon-name">mark-location-symbolic</property>
-                    <property name="tooltip-text" translatable="yes">Open Location</property>
+              <object class="AdwPreferencesGroup">
+                <child>
+                  <object class="AdwActionRow">
+                    <property name="title" translatable="yes">Image Size</property>
+                    <binding name="subtitle">
+                      <lookup name="dimensions">LpPropertiesView</lookup>
+                    </binding>
                     <style>
-                      <class name="flat"/>
+                      <class name="property"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwActionRow">
+                    <property name="title" translatable="yes">File Type</property>
+                    <binding name="subtitle">
+                      <closure type="gchararray" function="file_type">
+                        <lookup name="file-info">LpPropertiesView</lookup>
+                      </closure>
+                    </binding>
+                    <style>
+                      <class name="property"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwActionRow">
+                    <property name="title" translatable="yes">File Size</property>
+                    <binding name="subtitle">
+                      <closure type="gchararray" function="file_size">
+                        <lookup name="file-info">LpPropertiesView</lookup>
+                      </closure>
+                    </binding>
+                    <style>
+                      <class name="property"/>
                     </style>
                   </object>
                 </child>
-                <style>
-                  <class name="property"/>
-                </style>
               </object>
             </child>
             <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">Originally Created</property>
-                <binding name="subtitle">
-                  <lookup name="originally-created">
-                    <lookup name="metadata">LpPropertiesView</lookup>
-                  </lookup>
-                </binding>
-                <binding name="visible">
-                  <closure type="gboolean" function="has_content">
-                    <lookup name="originally-created">
-                      <lookup name="metadata">LpPropertiesView</lookup>
-                    </lookup>
-                  </closure>
-                </binding>
-                <style>
-                  <class name="property"/>
-                </style>
+              <object class="AdwPreferencesGroup">
+                <child>
+                  <object class="AdwActionRow">
+                    <property name="title" translatable="yes">File Created</property>
+                    <binding name="subtitle">
+                      <closure type="gchararray" function="created_date">
+                        <lookup name="file-info">LpPropertiesView</lookup>
+                      </closure>
+                    </binding>
+                    <style>
+                      <class name="property"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwActionRow">
+                    <property name="title" translatable="yes">File Modified</property>
+                    <binding name="subtitle">
+                      <closure type="gchararray" function="modified_date">
+                        <lookup name="file-info">LpPropertiesView</lookup>
+                      </closure>
+                    </binding>"
+                    <style>
+                      <class name="property"/>
+                    </style>
+                  </object>
+                </child>
               </object>
             </child>
             <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">Aperture</property>
-                <binding name="subtitle">
-                  <lookup name="f-number">
+              <object class="AdwPreferencesGroup">
+                <binding name="visible">
+                  <lookup name="has-information">
                     <lookup name="metadata">LpPropertiesView</lookup>
                   </lookup>
                 </binding>
-                <binding name="visible">
-                  <closure type="gboolean" function="has_content">
-                    <lookup name="f-number">
-                      <lookup name="metadata">LpPropertiesView</lookup>
-                    </lookup>
-                  </closure>
-                </binding>
-                <style>
-                  <class name="property"/>
-                </style>
+                <child>
+                  <object class="AdwActionRow">
+                    <property name="title" translatable="yes">Location</property>
+                    <property name="activatable-widget">location_button</property>
+                    <binding name="subtitle">
+                      <lookup name="location">
+                        <lookup name="metadata">LpPropertiesView</lookup>
+                      </lookup>
+                    </binding>
+                    <binding name="visible">
+                      <closure type="gboolean" function="has_content">
+                        <lookup name="location">
+                          <lookup name="metadata">LpPropertiesView</lookup>
+                        </lookup>
+                      </closure>
+                    </binding>
+                    <child type="suffix">
+                      <object class="GtkButton" id="location_button">
+                        <property name="valign">center</property>
+                        <property name="action-name">properties.open-location</property>
+                        <property name="icon-name">mark-location-symbolic</property>
+                        <property name="tooltip-text" translatable="yes">Open Location</property>
+                        <style>
+                          <class name="flat"/>
+                        </style>
+                      </object>
+                    </child>
+                    <style>
+                      <class name="property"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwActionRow">
+                    <property name="title" translatable="yes">Originally Created</property>
+                    <binding name="subtitle">
+                      <lookup name="originally-created">
+                        <lookup name="metadata">LpPropertiesView</lookup>
+                      </lookup>
+                    </binding>
+                    <binding name="visible">
+                      <closure type="gboolean" function="has_content">
+                        <lookup name="originally-created">
+                          <lookup name="metadata">LpPropertiesView</lookup>
+                        </lookup>
+                      </closure>
+                    </binding>
+                    <style>
+                      <class name="property"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwActionRow">
+                    <property name="title" translatable="yes">Aperture</property>
+                    <binding name="subtitle">
+                      <lookup name="f-number">
+                        <lookup name="metadata">LpPropertiesView</lookup>
+                      </lookup>
+                    </binding>
+                    <binding name="visible">
+                      <closure type="gboolean" function="has_content">
+                        <lookup name="f-number">
+                          <lookup name="metadata">LpPropertiesView</lookup>
+                        </lookup>
+                      </closure>
+                    </binding>
+                    <style>
+                      <class name="property"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwActionRow">
+                    <property name="title" translatable="yes">Exposure</property>
+                    <binding name="subtitle">
+                      <lookup name="exposure-time">
+                        <lookup name="metadata">LpPropertiesView</lookup>
+                      </lookup>
+                    </binding>
+                    <binding name="visible">
+                      <closure type="gboolean" function="has_content">
+                        <lookup name="exposure-time">
+                          <lookup name="metadata">LpPropertiesView</lookup>
+                        </lookup>
+                      </closure>
+                    </binding>
+                    <style>
+                      <class name="property"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwActionRow">
+                    <property name="title" translatable="yes">ISO</property>
+                    <binding name="subtitle">
+                      <lookup name="iso">
+                        <lookup name="metadata">LpPropertiesView</lookup>
+                      </lookup>
+                    </binding>
+                    <binding name="visible">
+                      <closure type="gboolean" function="has_content">
+                        <lookup name="iso">
+                          <lookup name="metadata">LpPropertiesView</lookup>
+                        </lookup>
+                      </closure>
+                    </binding>
+                    <style>
+                      <class name="property"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwActionRow">
+                    <property name="title" translatable="yes">Focal Length</property>
+                    <binding name="subtitle">
+                      <lookup name="focal-length">
+                        <lookup name="metadata">LpPropertiesView</lookup>
+                      </lookup>
+                    </binding>
+                    <binding name="visible">
+                      <closure type="gboolean" function="has_content">
+                        <lookup name="focal-length">
+                          <lookup name="metadata">LpPropertiesView</lookup>
+                        </lookup>
+                      </closure>
+                    </binding>
+                    <style>
+                      <class name="property"/>
+                    </style>
+                  </object>
+                </child>
+                <child>
+                  <object class="AdwActionRow">
+                    <property name="title" translatable="yes">Maker, Model</property>
+                    <binding name="subtitle">
+                      <lookup name="maker-model">
+                        <lookup name="metadata">LpPropertiesView</lookup>
+                      </lookup>
+                    </binding>
+                    <binding name="visible">
+                      <closure type="gboolean" function="has_content">
+                        <lookup name="maker-model">
+                          <lookup name="metadata">LpPropertiesView</lookup>
+                        </lookup>
+                      </closure>
+                    </binding>
+                    <style>
+                      <class name="property"/>
+                    </style>
+                  </object>
+                </child>
               </object>
             </child>
-            <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">Exposure</property>
-                <binding name="subtitle">
-                  <lookup name="exposure-time">
-                    <lookup name="metadata">LpPropertiesView</lookup>
-                  </lookup>
-                </binding>
-                <binding name="visible">
-                  <closure type="gboolean" function="has_content">
-                    <lookup name="exposure-time">
-                      <lookup name="metadata">LpPropertiesView</lookup>
-                    </lookup>
-                  </closure>
-                </binding>
-                <style>
-                  <class name="property"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">ISO</property>
-                <binding name="subtitle">
-                  <lookup name="iso">
-                    <lookup name="metadata">LpPropertiesView</lookup>
-                  </lookup>
-                </binding>
-                <binding name="visible">
-                  <closure type="gboolean" function="has_content">
-                    <lookup name="iso">
-                      <lookup name="metadata">LpPropertiesView</lookup>
-                    </lookup>
-                  </closure>
-                </binding>
-                <style>
-                  <class name="property"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">Focal Length</property>
-                <binding name="subtitle">
-                  <lookup name="focal-length">
-                    <lookup name="metadata">LpPropertiesView</lookup>
-                  </lookup>
-                </binding>
-                <binding name="visible">
-                  <closure type="gboolean" function="has_content">
-                    <lookup name="focal-length">
-                      <lookup name="metadata">LpPropertiesView</lookup>
-                    </lookup>
-                  </closure>
-                </binding>
-                <style>
-                  <class name="property"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="AdwActionRow">
-                <property name="title" translatable="yes">Maker, Model</property>
-                <binding name="subtitle">
-                  <lookup name="maker-model">
-                    <lookup name="metadata">LpPropertiesView</lookup>
-                  </lookup>
-                </binding>
-                <binding name="visible">
-                  <closure type="gboolean" function="has_content">
-                    <lookup name="maker-model">
-                      <lookup name="metadata">LpPropertiesView</lookup>
-                    </lookup>
-                  </closure>
-                </binding>
-                <style>
-                  <class name="property"/>
-                </style>
-              </object>
-            </child>-->
           </object>
-        </child>
+        </property>
       </object>
     </property>
   </template>