diff options
author | Mark Hung <marklh9@gmail.com> | 2016-04-09 23:45:28 +0800 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2016-04-11 10:30:47 +0000 |
commit | e9230b2b09a8dc0ea71263a1c321f4f63a222ac9 (patch) | |
tree | f846d0af2b89c56b4bffa9bed2b4ab6b373ea249 /framework | |
parent | cab0323ebce6f46baad32c41829e3a5e93a10e4b (diff) |
tdf#48300 bring window to top and restore window when minimized.
While XWindow->ToTop() in Linux do the both for default ( None ),
ToTopFlags::RestoreWhenMin has to be specified in Windows in order
to restore the window, and ToTopFlags::ForegroundTask is necessary
when ToTopFlags::RestoreWhenMin is specified in order to bring
non-minimized window to the front.
Change-Id: Ief4a825a18d874a0c35211c9022a4261da6bcf8f
Reviewed-on: https://gerrit.libreoffice.org/23938
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/source/loadenv/loadenv.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 6084133d75c9..5daa22367e63 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1655,7 +1655,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X } if( pWindow->IsVisible() && (bForceFrontAndFocus || bForceToFront) ) - pWindow->ToTop(); + pWindow->ToTop( ToTopFlags::RestoreWhenMin | ToTopFlags::ForegroundTask ); else pWindow->Show(true, (bForceFrontAndFocus || bForceToFront) ? ShowFlags::ForegroundTask : ShowFlags::NONE ); } |