include/vcl/layout.hxx | 1 + vcl/source/window/layout.cxx | 33 +++++++++++++++++++++++++++++++++ vcl/source/window/window.cxx | 4 ++++ 3 files changed, 38 insertions(+)
New commits: commit 1a7ca9b41362068e5c19317b8e63ad0343960974 Author: Szymon Kłos <[email protected]> AuthorDate: Wed Dec 9 07:58:53 2020 +0100 Commit: Szymon Kłos <[email protected]> CommitDate: Mon Dec 28 14:31:54 2020 +0100 jsdialog: dump buttonbox properties Change-Id: I638169db902961cff58a415b009f7412cd8b274a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107449 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108395 Tested-by: Jenkins diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx index 34d7e9a023c9..cbcb6d2373f0 100644 --- a/include/vcl/layout.hxx +++ b/include/vcl/layout.hxx @@ -214,6 +214,7 @@ public: { } virtual bool set_property(const OString &rKey, const OUString &rValue) override; + virtual void DumpAsPropertyTree(tools::JsonWriter&) override; protected: virtual Size calculateRequisition() const override; virtual void setAllocation(const Size &rAllocation) override; diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index d432002e7ade..b8407e84afba 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -692,6 +692,39 @@ void VclButtonBox::setAllocation(const Size &rAllocation) } } +void VclButtonBox::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter) +{ + VclBox::DumpAsPropertyTree(rJsonWriter); + rJsonWriter.put("type", "buttonbox"); + + switch(m_eLayoutStyle) + { + case VclButtonBoxStyle::Default: + rJsonWriter.put("layoutstyle", "default"); + break; + + case VclButtonBoxStyle::Spread: + rJsonWriter.put("layoutstyle", "spread"); + break; + + case VclButtonBoxStyle::Edge: + rJsonWriter.put("layoutstyle", "edge"); + break; + + case VclButtonBoxStyle::Center: + rJsonWriter.put("layoutstyle", "center"); + break; + + case VclButtonBoxStyle::Start: + rJsonWriter.put("layoutstyle", "start"); + break; + + case VclButtonBoxStyle::End: + rJsonWriter.put("layoutstyle", "end"); + break; + } +} + namespace { struct ButtonOrder commit 51dd1c36f6932ab3aa4a7bb8522f8f96e7b40bf7 Author: Szymon Kłos <[email protected]> AuthorDate: Wed Dec 9 06:51:51 2020 +0100 Commit: Szymon Kłos <[email protected]> CommitDate: Mon Dec 28 14:31:47 2020 +0100 jsdialog: export column merging property in grid Change-Id: I660e7ae6b2cce41212aee37d23b37a0cb167a14c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107447 Tested-by: Jenkins CollaboraOffice <[email protected]> Reviewed-by: Szymon Kłos <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108396 Tested-by: Jenkins diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 719a5268c2f2..cc3899e8fa4d 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -3382,6 +3382,10 @@ void Window::DumpAsPropertyTree(tools::JsonWriter& rJsonWriter) rJsonWriter.put("left", nLeft); rJsonWriter.put("top", nTop); } + + sal_Int32 nWidth = pChild->get_grid_width(); + if (nWidth > 1) + rJsonWriter.put("width", nWidth); } pChild = pChild->mpWindowImpl->mpNext; } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
