diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2020-03-18 09:46:03 +0100 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2020-07-02 12:45:23 +0200 |
| commit | 5e33874cfa778e803a04eb088d3817803d12f01e (patch) | |
| tree | f26a9ef61ea8d9978e95f1b20c5d14ed600aa67a /vcl/jsdialog | |
| parent | 2dcae49ad62dc37cd0b11424569d25749669ffa6 (diff) | |
jsdialog: regenerate JSON on dialog collapse
Change-Id: I407979546a7610630e8109b57db8c98c956baaee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97735
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
Diffstat (limited to 'vcl/jsdialog')
| -rw-r--r-- | vcl/jsdialog/jsdialogbuilder.cxx | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx index a0b2ae652c72..56970d32f6f3 100644 --- a/vcl/jsdialog/jsdialogbuilder.cxx +++ b/vcl/jsdialog/jsdialogbuilder.cxx @@ -154,8 +154,8 @@ std::unique_ptr<weld::Dialog> JSInstanceBuilder::weld_dialog(const OString& id, InsertWindowToMap(m_nWindowId); - std::unique_ptr<weld::Dialog> pRet(pDialog ? new SalInstanceDialog(pDialog, this, false) - : nullptr); + std::unique_ptr<weld::Dialog> pRet( + pDialog ? new JSDialog(m_aOwnedToplevel, pDialog, this, false) : nullptr); if (bTakeOwnership && pDialog) { assert(!m_aOwnedToplevel && "only one toplevel per .ui allowed"); @@ -348,6 +348,24 @@ weld::MessageDialog* JSInstanceBuilder::CreateMessageDialog(weld::Widget* pParen return new JSMessageDialog(xMessageDialog, nullptr, true); } +JSDialog::JSDialog(VclPtr<vcl::Window> aOwnedToplevel, ::Dialog* pDialog, + SalInstanceBuilder* pBuilder, bool bTakeOwnership) + : JSWidget<SalInstanceDialog, ::Dialog>(aOwnedToplevel, pDialog, pBuilder, bTakeOwnership) +{ +} + +void JSDialog::collapse(weld::Widget* pEdit, weld::Widget* pButton) +{ + SalInstanceDialog::collapse(pEdit, pButton); + notifyDialogState(); +} + +void JSDialog::undo_collapse() +{ + SalInstanceDialog::undo_collapse(); + notifyDialogState(); +} + JSLabel::JSLabel(VclPtr<vcl::Window> aOwnedToplevel, FixedText* pLabel, SalInstanceBuilder* pBuilder, bool bTakeOwnership) : JSWidget<SalInstanceLabel, FixedText>(aOwnedToplevel, pLabel, pBuilder, bTakeOwnership) |