vcl/unx/gtk3/gtkinst.cxx | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
New commits:
commit ac5b355f7afae4eaddb9e11ead95dfad63fe2b97
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue May 18 10:45:24 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue May 18 13:08:53 2021 +0200
gtk4: convert width/height to column-span/row-span
Change-Id: I312fa611e125334981a505dd0cc0008f26c0c1d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115731
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 08d21e0728df..41aa2ee6d9ea 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -17945,12 +17945,22 @@ bool ConvertTree(const
Reference<css::xml::dom::XNode>& xNode)
xName->setNodeValue("column");
bGridPacking = true;
}
- if (sName == "top-attach")
+ else if (sName == "top-attach")
{
xName->setNodeValue("row");
bGridPacking = true;
}
- if (sName == "secondary")
+ else if (sName == "width")
+ {
+ xName->setNodeValue("column-span");
+ bGridPacking = true;
+ }
+ else if (sName == "height")
+ {
+ xName->setNodeValue("row-span");
+ bGridPacking = true;
+ }
+ else if (sName == "secondary")
{
// turn parent tag of <child> into <child type="start">
auto xParent = xChild->getParentNode();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
