diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-24 16:02:18 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-24 17:56:44 +0200 |
| commit | 0c31dd6f4ee14a8dc41159ce4e18a7d299d0a341 (patch) | |
| tree | e25f9b067664c0d51a67085f2cc94de6580d2b55 | |
| parent | ed52d1eb0aaceed3aae1c182091401f9c433acdd (diff) | |
gtk4: transform GtkScrolledWindow shadow-type to has-frame
Change-Id: Ib9970bad9fbf32def0bcea6ffde42e4204dd4a06
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116063
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | vcl/unx/gtk3/gtkinst.cxx | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index dac7738075f4..90c36c060476 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -18345,6 +18345,15 @@ bool ConvertTree(const Reference<css::xml::dom::XNode>& xNode) { if (GetParentObjectType(xChild) == "GtkFrame") xRemoveList.push_back(xChild); + else if (GetParentObjectType(xChild) == "GtkScrolledWindow") + { + bool bHasFrame = xChild->getFirstChild()->getNodeValue() != "none"; + auto xDoc = xChild->getOwnerDocument(); + auto xHasFrame = CreateProperty(xDoc, "has-frame", + bHasFrame ? OUString("True") : OUString("False")); + xChild->getParentNode()->insertBefore(xHasFrame, xChild); + xRemoveList.push_back(xChild); + } } if (sName == "relief") @@ -19627,6 +19636,7 @@ weld::Builder* GtkInstance::CreateBuilder(weld::Widget* pParent, const OUString& #if GTK_CHECK_VERSION(4, 0, 0) if (rUIFile != "cui/ui/hyphenate.ui" && rUIFile != "cui/ui/percentdialog.ui" && + rUIFile != "cui/ui/signatureline.ui" && rUIFile != "sfx/ui/querysavedialog.ui" && rUIFile != "cui/ui/tipofthedaydialog.ui" && rUIFile != "sfx/ui/licensedialog.ui" && |