diff options
| author | Pranav Kant <pranavk@collabora.co.uk> | 2017-12-05 02:20:13 +0530 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2018-07-13 18:47:30 +0200 |
| commit | dc30fdcf7277d2d86f45b1c36384d8b54be29111 (patch) | |
| tree | 35b241ffca64ae71f1d5604274bb21f5281d96b1 | |
| parent | c1817a5b12da642e365a3ef72b556d33c6e29a76 (diff) | |
lokdialog: Don't hide dialogs in case of LOK
We change views (using setView) a lot in case of LOK. Changing the view,
without this patch, leads to InitShow on the dialog which means
invalidation of the whole dialog even though there is nothing to
invalidate. This decreases performance as it increases the dialog paint
traffic through the LOK API. We don't need to hide the dialog once it's
opened in case of LOK.
This patch improves the multiview dialog performance considerably
(can easily be noticed in GTV).
Change-Id: If2b4ceb945ccd86da3d90bbbb0a0b9fbade43f30
Reviewed-on: https://gerrit.libreoffice.org/57401
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jan Holesovsky <kendy@collabora.com>
| -rw-r--r-- | sfx2/source/appl/workwin.cxx | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index 3f6f3ca0a1e1..af5d0cdb4bbf 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -18,6 +18,7 @@ */ #include <config_features.h> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <sfx2/docfile.hxx> @@ -1482,6 +1483,9 @@ bool SfxWorkWindow::IsVisible_Impl() void SfxWorkWindow::HidePopups_Impl(bool bHide, bool bParent, sal_uInt16 nId ) { + if (comphelper::LibreOfficeKit::isActive() && bHide) + return; + for (SfxChildWin_Impl* i : aChildWins) { SfxChildWindow *pCW = i->pWin; @@ -1494,7 +1498,8 @@ void SfxWorkWindow::HidePopups_Impl(bool bHide, bool bParent, sal_uInt16 nId ) pChild->nVisible &= ~SfxChildVisibility::ACTIVE; pCW->Hide(); } - else + else if ( !comphelper::LibreOfficeKit::isActive() || + SfxChildVisibility::ACTIVE != (pChild->nVisible & SfxChildVisibility::ACTIVE) ) { pChild->nVisible |= SfxChildVisibility::ACTIVE; if ( SfxChildVisibility::VISIBLE == (pChild->nVisible & SfxChildVisibility::VISIBLE) ) |