sw/uiconfig/swriter/ui/scrollbars.ui | 2 ++
vcl/unx/gtk4/convert3to4.cxx | 10 +++++-----
2 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 1e5715907062570f2331ac2a640a1ee18ce71f44
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Aug 3 13:58:35 2022 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Aug 3 20:24:16 2022 +0200
gtk4: tweaks for native gtk4 scrollbars in writer
Change-Id: I42072354fd6f901035d1419f9f9402eac2eaaaac
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137751
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sw/uiconfig/swriter/ui/scrollbars.ui
b/sw/uiconfig/swriter/ui/scrollbars.ui
index c448d3ff187f..d29d1645d573 100644
--- a/sw/uiconfig/swriter/ui/scrollbars.ui
+++ b/sw/uiconfig/swriter/ui/scrollbars.ui
@@ -21,6 +21,7 @@
<child>
<object class="GtkScrollbar" id="vertical">
<property name="can-focus">False</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="adjustment">adjustment1</property>
</object>
@@ -33,6 +34,7 @@
<child>
<object class="GtkScrollbar" id="horizontal">
<property name="can-focus">False</property>
+ <property name="hexpand">True</property>
<property name="adjustment">adjustment2</property>
</object>
<packing>
diff --git a/vcl/unx/gtk4/convert3to4.cxx b/vcl/unx/gtk4/convert3to4.cxx
index 3dc2eae08a11..5d9000232695 100644
--- a/vcl/unx/gtk4/convert3to4.cxx
+++ b/vcl/unx/gtk4/convert3to4.cxx
@@ -1037,11 +1037,11 @@ ConvertResult Convert3To4(const
css::uno::Reference<css::xml::dom::XNode>& xNode
|| sClass == "GtkFrame" || sClass == "GtkGrid" || sClass
== "GtkImage"
|| sClass == "GtkLabel" || sClass == "GtkMenuButton" ||
sClass == "GtkNotebook"
|| sClass == "GtkOverlay" || sClass == "GtkPaned" ||
sClass == "GtkProgressBar"
- || sClass == "GtkScrolledWindow" || sClass ==
"GtkSeparator"
- || sClass == "GtkSpinButton" || sClass == "GtkSpinner"
- || sClass == "GtkTextView" || sClass == "GtkTreeView" ||
sClass == "GtkViewport"
- || sClass == "GtkLinkButton" || sClass == "GtkToggleButton"
- || sClass == "GtkButtonBox")
+ || sClass == "GtkScrolledWindow" || sClass ==
"GtkScrollbar"
+ || sClass == "GtkSeparator" || sClass == "GtkSpinButton"
+ || sClass == "GtkSpinner" || sClass == "GtkTextView" ||
sClass == "GtkTreeView"
+ || sClass == "GtkViewport" || sClass == "GtkLinkButton"
+ || sClass == "GtkToggleButton" || sClass == "GtkButtonBox")
{
auto xVisible = CreateProperty(xDoc, "visible", "False");
