[Libreoffice-commits] core.git: Branch 'distro/collabora/co-2021' - vcl/inc
Szymon KÅos (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jun 11 18:42:20 UTC 2021
vcl/inc/jsdialog/jsdialogbuilder.hxx | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
New commits:
commit af9c4818e14391536dddbb462f4ce4d4ee527a7e
Author: Szymon Kłos <szymon.klos at collabora.com>
AuthorDate: Fri Jun 11 19:59:07 2021 +0200
Commit: Szymon Kłos <szymon.klos at collabora.com>
CommitDate: Fri Jun 11 20:41:45 2021 +0200
jsdialog: don't send unnecessary show/hide messages
Change-Id: Ie37503b5964606a2b3e5b305c949f570616dc1cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117070
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
Reviewed-by: Szymon Kłos <szymon.klos at collabora.com>
diff --git a/vcl/inc/jsdialog/jsdialogbuilder.hxx b/vcl/inc/jsdialog/jsdialogbuilder.hxx
index cbdd4669cab3..70eb489f42ba 100644
--- a/vcl/inc/jsdialog/jsdialogbuilder.hxx
+++ b/vcl/inc/jsdialog/jsdialogbuilder.hxx
@@ -313,18 +313,26 @@ public:
virtual void show() override
{
+ bool bWasVisible = BaseInstanceClass::get_visible();
BaseInstanceClass::show();
- std::unique_ptr<ActionDataMap> pMap = std::make_unique<ActionDataMap>();
- (*pMap)[ACTION_TYPE] = "show";
- sendAction(std::move(pMap));
+ if (!bWasVisible)
+ {
+ std::unique_ptr<ActionDataMap> pMap = std::make_unique<ActionDataMap>();
+ (*pMap)[ACTION_TYPE] = "show";
+ sendAction(std::move(pMap));
+ }
}
virtual void hide() override
{
+ bool bWasVisible = BaseInstanceClass::get_visible();
BaseInstanceClass::hide();
- std::unique_ptr<ActionDataMap> pMap = std::make_unique<ActionDataMap>();
- (*pMap)[ACTION_TYPE] = "hide";
- sendAction(std::move(pMap));
+ if (bWasVisible)
+ {
+ std::unique_ptr<ActionDataMap> pMap = std::make_unique<ActionDataMap>();
+ (*pMap)[ACTION_TYPE] = "hide";
+ sendAction(std::move(pMap));
+ }
}
using BaseInstanceClass::set_sensitive;
More information about the Libreoffice-commits
mailing list