diff options
| author | Jim Raykowski <raykowj@gmail.com> | 2019-02-15 08:07:49 +0100 |
|---|---|---|
| committer | Jim Raykowski <raykowj@gmail.com> | 2019-02-15 23:14:19 +0100 |
| commit | 5a557821c647c1a499270a8a1188e23fc015f782 (patch) | |
| tree | 15983d7ad24208e6322e607e18e60b87033a4437 | |
| parent | 8c28bc32de753b403760bf79cb0415988ab0d89f (diff) | |
Revert "tdf#49684 Don't focus on Navigator or Sidebar on show"
See tdf#122900 for unwanted behavior changed caused by this.
This reverts commit 88cbc3ea2db8358bbedff01361f95f972f2b0231.
Change-Id: I9451a4b1f059b40d33b66b06f23228fc64170d8d
Reviewed-on: https://gerrit.libreoffice.org/67853
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>
| -rw-r--r-- | sfx2/source/dialog/navigat.cxx | 1 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarChildWindow.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/navipi.cxx | 3 |
3 files changed, 4 insertions, 2 deletions
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index e8cb333181e0..7ce24a62e073 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -43,7 +43,6 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( vcl::Window* pParentWnd , static_cast<SfxDockingWindow*>( GetWindow() )->Initialize( pInfo ); SetHideNotDelete( true ); - Show( ShowFlags::NoFocusChange ); } SfxNavigator::SfxNavigator( SfxBindings* pBind , diff --git a/sfx2/source/sidebar/SidebarChildWindow.cxx b/sfx2/source/sidebar/SidebarChildWindow.cxx index 9c96f17ccf5b..7153c1d461b1 100644 --- a/sfx2/source/sidebar/SidebarChildWindow.cxx +++ b/sfx2/source/sidebar/SidebarChildWindow.cxx @@ -60,7 +60,7 @@ SidebarChildWindow::SidebarChildWindow (vcl::Window* pParentWindow, sal_uInt16 n } SetHideNotDelete(true); - GetWindow()->Show(true, ShowFlags::NoFocusChange); + GetWindow()->Show(); } sal_Int32 SidebarChildWindow::GetDefaultWidth (vcl::Window const * pWindow) diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index 01fdf5c6372a..8ea7f633b5f8 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -739,7 +739,10 @@ SwNavigationPI::SwNavigationPI(SfxBindings* _pBindings, pActView->GetWrtShellPtr()->IsGlblDocSaveLinks()); if (m_pConfig->IsGlobalActive()) ToggleTree(); + m_aGlobalTree->GrabFocus(); } + else + m_aContentTree->GrabFocus(); UsePage(); m_aPageChgIdle.SetInvokeHandler(LINK(this, SwNavigationPI, ChangePageHdl)); m_aPageChgIdle.SetPriority(TaskPriority::LOWEST); |