diff options
| author | Pranam Lashkari <lpranam@collabora.com> | 2021-03-02 06:04:40 +0530 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2021-03-07 21:55:59 +0100 |
| commit | 4f7121822037f89a1802e00dddf9f21a8df7c91c (patch) | |
| tree | 9ad91d1bb01f6153e0c320a9c9d9d7b790cc9701 /vcl | |
| parent | 5ad541462aec381bb6a9d86db5ed20ecb6ddb496 (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/+/111892
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Andras Timar <andras.timar@collabora.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 c5d6a93798d4..34065088f137 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -809,6 +809,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 @@ -830,6 +834,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 fa402bb3aa2c..5b0f7243f268 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -300,6 +300,7 @@ void DockingWindow::ImplInitDockingWindowData() mbIsDeferredInit = false; mbIsCalculatingInitialLayoutSize = false; mpDialogParent = nullptr; + mnLOKPopUpWinId = 0; //To-Do, reuse maResizeTimer maLayoutIdle.SetPriority(TaskPriority::RESIZE); |