[Libreoffice-commits] core.git: 2 commits - bin/ui-rules-enforcer.py dbaccess/uiconfig vcl/unx

[Caolán McNamara (via logerrit)]

 bin/ui-rules-enforcer.py                 |   13 +++++++++++++
 dbaccess/uiconfig/ui/parametersdialog.ui |    1 -
 vcl/unx/gtk3/gtkinst.cxx                 |    9 +++++----
 3 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit b2786cb25f78aec212056810e2b9a8b61cec5d36
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Jan 29 14:03:51 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Jan 29 16:41:15 2022 +0100

    gtk4: remove stray 'gravity' property
    
    Change-Id: Ia68e3d96a7fbc381fc4215800b33dd21d2a38119
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129138
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/bin/ui-rules-enforcer.py b/bin/ui-rules-enforcer.py
index 5079d8e67ce1..fcf2d0505b97 100755
--- a/bin/ui-rules-enforcer.py
+++ b/bin/ui-rules-enforcer.py
@@ -364,6 +364,18 @@ def remove_skip_pager_hint(current):
   if skip_pager_hint != None:
     current.remove(skip_pager_hint)
 
+def remove_gravity(current):
+  gravity = None
+  for child in current:
+    remove_gravity(child)
+    if child.tag == "property":
+      attributes = child.attrib
+      if attributes.get("name") == "gravity":
+        gravity = child
+
+  if gravity != None:
+    current.remove(gravity)
+
 def remove_expander_label_fill(current):
   label_fill = None
   isexpander = current.get('class') == "GtkExpander"
@@ -600,6 +612,7 @@ enforce_entry_text_column_id_column_for_gtkcombobox(root)
 remove_entry_shadow_type(root)
 remove_double_buffered(root)
 remove_skip_pager_hint(root)
+remove_gravity(root)
 remove_toolbutton_focus(root)
 enforce_toolbar_can_focus(root)
 enforce_button_always_show_image(root)
diff --git a/dbaccess/uiconfig/ui/parametersdialog.ui 
b/dbaccess/uiconfig/ui/parametersdialog.ui
index 5ca6bde3de60..0f1192cfb266 100644
--- a/dbaccess/uiconfig/ui/parametersdialog.ui
+++ b/dbaccess/uiconfig/ui/parametersdialog.ui
@@ -20,7 +20,6 @@
     <property name="default_width">0</property>
     <property name="default_height">0</property>
     <property name="type_hint">dialog</property>
-    <property name="gravity">north</property>
     <child>
       <placeholder/>
     </child>
commit 77e78027ed87c7a299fc4a5056af6dab0d7d396d
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Jan 29 13:57:54 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Jan 29 16:41:00 2022 +0100

    gtk4: implement create_screenshot_window
    
    Change-Id: I7c99ead4a7a3107039d5ec096ad4a96463a8a432
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129137
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index e2801448ac73..0201fb1cd273 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -22951,7 +22951,6 @@ public:
 
     virtual std::unique_ptr<weld::Window> create_screenshot_window() override
     {
-#if !GTK_CHECK_VERSION(4, 0, 0)
         GtkWidget* pTopLevel = nullptr;
 
         for (GSList* l = m_pObjectList; l; l = g_slist_next(l))
@@ -22979,16 +22978,18 @@ public:
             ::set_help_id(GTK_WIDGET(pDialog), ::get_help_id(pTopLevel));
 
             GtkWidget* pContentArea = 
gtk_dialog_get_content_area(GTK_DIALOG(pDialog));
+#if !GTK_CHECK_VERSION(4, 0, 0)
             gtk_container_add(GTK_CONTAINER(pContentArea), pTopLevel);
             gtk_widget_show_all(pTopLevel);
+#else
+            gtk_box_append(GTK_BOX(pContentArea), pTopLevel);
+            gtk_widget_show(pTopLevel);
+#endif
         }
 
         if (m_pParentWidget)
             gtk_window_set_transient_for(pDialog, 
GTK_WINDOW(widget_get_toplevel(m_pParentWidget)));
         return std::make_unique<GtkInstanceDialog>(pDialog, this, true);
-#else
-        return nullptr;
-#endif
     }
 
     virtual std::unique_ptr<weld::Widget> weld_widget(const OString &id) 
override