diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2019-11-30 14:59:02 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2019-12-02 17:22:02 +0100 |
| commit | 2f463f9d1f45546318a57de57f6e5e918063af0a (patch) | |
| tree | ed0e81124ae7e26c3ee4b27915f47b42ad5c7d22 /sfx2 | |
| parent | 1903d0275b09d88eec6e57303a8a7d34246cb230 (diff) | |
lok: add viewId to window painting, to allow special-casing on render.
View switching should not cause the sidebar UX to re-build at all.
Particularly it should not do this when we switch view just to render
a sidebar.
Change-Id: Iec0427cdc8308fc273d73ea56dd208bfa7036471
Reviewed-on: https://gerrit.libreoffice.org/84120
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
(cherry picked from commit 92814f3389de346f3ae32cddb38f079763e68ddf)
Reviewed-on: https://gerrit.libreoffice.org/84129
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/84223
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/control/shell.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index 85c84d632df5..285420a6381b 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -30,6 +30,7 @@ #include <svtools/asynclink.hxx> #include <basic/sbx.hxx> #include <unotools/configmgr.hxx> +#include <comphelper/lok.hxx> #include <sfx2/app.hxx> #include <sfx2/shell.hxx> #include <sfx2/bindings.hxx> @@ -706,6 +707,12 @@ void SfxShell::SetViewShell_Impl( SfxViewShell* pView ) void SfxShell::BroadcastContextForActivation (const bool bIsActivated) { + // Avoids activation and de-activation (can be seen on switching view) from causing + // the sidebar to re-build. Such switching can happen as we change view to render + // using LOK for example, and is un-necessary for Online. + if (comphelper::LibreOfficeKit::isDialogPainting()) + return; + SfxViewFrame* pViewFrame = GetFrame(); if (pViewFrame != nullptr) { |