diff options
| author | Pranam Lashkari <lpranam@collabora.com> | 2021-03-02 06:04:40 +0530 |
|---|---|---|
| committer | Pranam Lashkari <lpranam@collabora.com> | 2021-03-03 14:44:04 +0100 |
| commit | f1525c89ccf2b80f284bea68bd7a62dfaaff56a4 (patch) | |
| tree | 037e570082123a6469d9b4eb1383eaa6fc0335d9 /vcl | |
| parent | 505965dd5d05e4711bf5b433b8af06e88e030962 (diff) | |
LOK: added missing PixelInvalidate method for currency list
when docking window is displayed in popup mode,
there are two windows created docking window and floating window,
to make the this window work correctly with LOK,
we have to invalidate the floating window to update floating window,
as well as docking window.
Change-Id: Ia1b4220646664aa0666a24e34fc14bf41421f9e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/111762
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dockmgr.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/window/dockwin.cxx | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index a0825e616467..3d70272ae04a 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -817,6 +817,10 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin mpFloatWin->StartPopupMode( pParentToolBox, nFlags ); GetWindow()->Show(); + DockingWindow* pDockWin = dynamic_cast< DockingWindow* >(mpDockingWindow.get()); + if (pDockWin) + pDockWin->SetPopUpWindowLOKId(mpFloatWin->GetLOKWindowId()); + if( pParentToolBox->IsKeyEvent() ) { // send HOME key to subtoolbar in order to select first item @@ -838,6 +842,10 @@ void ImplDockingWindowWrapper::StartPopupMode( const tools::Rectangle& rRect, Fl IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd, FloatingWindow*, void) { + DockingWindow* pDockWin = dynamic_cast< DockingWindow* >(mpDockingWindow.get()); + if (pDockWin) + pDockWin->SetPopUpWindowLOKId(0); + GetWindow()->Show( false, ShowFlags::NoFocusChange ); // set parameter for handler before destroying floating window diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 6ac2562d2f41..36cefbc201df 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -298,6 +298,7 @@ void DockingWindow::ImplInitDockingWindowData() mbIsDeferredInit = false; mbIsCalculatingInitialLayoutSize = false; mpDialogParent = nullptr; + mnLOKPopUpWinId = 0; //To-Do, reuse maResizeTimer maLayoutIdle.SetPriority(TaskPriority::RESIZE); |