framework/source/loadenv/loadenv.cxx | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
New commits: commit f0fbf30a9c9dab41fce10f3ad4bfc83434122c70 Author: Mike Kaganski <mike.kagan...@collabora.com> AuthorDate: Sun Sep 4 08:50:45 2022 +0300 Commit: Mike Kaganski <mike.kagan...@collabora.com> CommitDate: Sun Sep 4 10:41:33 2022 +0200 Some refactor Change-Id: I5b87f9298bfeec70848654eacf5086803c19080a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139354 Tested-by: Jenkins Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com> diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 76116ad98ed7..f8d0176b6276 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -1691,19 +1691,19 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X if ( !pWindow ) return; - bool const preview( m_lMediaDescriptor.getUnpackedValueOrDefault( - utl::MediaDescriptor::PROP_PREVIEW, false) ); - - bool bForceFrontAndFocus(false); - if ( !preview ) + if (!bForceToFront) { - bForceFrontAndFocus = officecfg::Office::Common::View::NewDocumentHandling::ForceFocusAndToFront::get(); + bool const preview(m_lMediaDescriptor.getUnpackedValueOrDefault( + utl::MediaDescriptor::PROP_PREVIEW, false)); + bForceToFront + = !preview + && officecfg::Office::Common::View::NewDocumentHandling::ForceFocusAndToFront::get(); } - if( pWindow->IsVisible() && (bForceFrontAndFocus || bForceToFront) ) + if (pWindow->IsVisible() && bForceToFront) pWindow->ToTop( ToTopFlags::RestoreWhenMin | ToTopFlags::ForegroundTask ); else - pWindow->Show(true, (bForceFrontAndFocus || bForceToFront) ? ShowFlags::ForegroundTask : ShowFlags::NONE ); + pWindow->Show(true, bForceToFront ? ShowFlags::ForegroundTask : ShowFlags::NONE); } void LoadEnv::impl_applyPersistentWindowState(const css::uno::Reference< css::awt::XWindow >& xWindow)