bin/ui-rules-enforcer.py | 17 +++++++++++++++++
svx/uiconfig/ui/absrecbox.ui | 2 --
svx/uiconfig/ui/navigationbar.ui | 1 -
3 files changed, 17 insertions(+), 3 deletions(-)
New commits:
commit 933464ad3cfc8af141d1035afbebdcceb6814bb7
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Jan 25 14:13:44 2022 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Jan 25 16:24:17 2022 +0100
gtk4: deprecated GtkEntry shadow_type was removed
Change-Id: I378db5406c508e3672927905735449a3a1003e3c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128928
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 c571e9748973..6fec6293244e 100755
--- a/bin/ui-rules-enforcer.py
+++ b/bin/ui-rules-enforcer.py
@@ -258,6 +258,22 @@ def remove_spin_button_max_length(current):
if max_length != None:
current.remove(max_length)
+def remove_entry_shadow_type(current):
+ shadow_type = None
+ isentry = current.get('class') == "GtkEntry"
+ for child in current:
+ remove_entry_shadow_type(child)
+ if not isentry:
+ continue
+ if child.tag == "property":
+ attributes = child.attrib
+ if attributes.get("name") == "shadow_type" or attributes.get("name") ==
"shadow-type":
+ shadow_type = child
+
+ if isentry:
+ if shadow_type!= None:
+ current.remove(shadow_type)
+
def remove_label_pad(current):
xpad = None
ypad = None
@@ -565,6 +581,7 @@ remove_expander_spacing(root)
enforce_menubutton_indicator_consistency(root)
enforce_active_in_group_consistency(root)
enforce_entry_text_column_id_column_for_gtkcombobox(root)
+remove_entry_shadow_type(root)
remove_double_buffered(root)
remove_skip_pager_hint(root)
remove_toolbutton_focus(root)
diff --git a/svx/uiconfig/ui/absrecbox.ui b/svx/uiconfig/ui/absrecbox.ui
index 635c39bff6da..2062570afdbf 100644
--- a/svx/uiconfig/ui/absrecbox.ui
+++ b/svx/uiconfig/ui/absrecbox.ui
@@ -16,7 +16,6 @@
<property name="vexpand">True</property>
<property name="width_chars">4</property>
<property name="truncate-multiline">True</property>
- <property name="shadow_type">none</property>
</object>
<packing>
<property name="expand">False</property>
@@ -33,7 +32,6 @@
<property name="has_frame">False</property>
<property name="width_chars">4</property>
<property name="truncate-multiline">True</property>
- <property name="shadow_type">none</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/svx/uiconfig/ui/navigationbar.ui b/svx/uiconfig/ui/navigationbar.ui
index 7810a763b27a..86fd015ab925 100644
--- a/svx/uiconfig/ui/navigationbar.ui
+++ b/svx/uiconfig/ui/navigationbar.ui
@@ -72,7 +72,6 @@
<property name="width_chars">4</property>
<property name="xalign">0.5</property>
<property name="truncate-multiline">True</property>
- <property name="shadow_type">none</property>
</object>
<packing>
<property name="expand">False</property>
