summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorJim Raykowski <raykowj@gmail.com>2018-10-09 22:28:27 -0800
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2018-11-05 08:47:13 +0100
commitcd086621e3d4fd4b90fabe0b20c0ae4602447d8a (patch)
tree14d92eec2f441de824da7466596c47b18ecae4fd /sfx2
parent0dfb0f09f5582a33d16c5ad8659fab198d530b31 (diff)
tdf#120473 Change sidebar panel content tab navigation behavior
Change-Id: Ifa5d52ffed32a4fe0bfe75fb731ee79d0976c0cf Reviewed-on: https://gerrit.libreoffice.org/61949 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/sidebar/FocusManager.cxx34
1 files changed, 1 insertions, 33 deletions
diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx
index 21bf36579973..9645cb182f4d 100644
--- a/sfx2/source/sidebar/FocusManager.cxx
+++ b/sfx2/source/sidebar/FocusManager.cxx
@@ -41,10 +41,7 @@ FocusManager::FocusManager(const std::function<void(const Panel&)>& rShowPanelFu
maPanels(),
maButtons(),
maShowPanelFunctor(rShowPanelFunctor),
- mbIsDeckOpenFunctor(rIsDeckOpenFunctor),
- mbObservingContentControlFocus(false),
- mpFirstFocusedContentControl(nullptr),
- mpLastFocusedWindow(nullptr)
+ mbIsDeckOpenFunctor(rIsDeckOpenFunctor)
{
}
@@ -265,11 +262,7 @@ void FocusManager::FocusPanelContent (const sal_Int32 nPanelIndex)
VclPtr<vcl::Window> pWindow = VCLUnoHelper::GetWindow(maPanels[nPanelIndex]->GetElementWindow());
if (pWindow)
- {
- mbObservingContentControlFocus = true;
pWindow->GrabFocus();
- mbObservingContentControlFocus = false;
- }
}
void FocusManager::FocusButton (const sal_Int32 nButtonIndex)
@@ -375,7 +368,6 @@ void FocusManager::HandleKeyEvent (
const vcl::Window& rWindow)
{
const FocusLocation aLocation (GetFocusLocation(rWindow));
- mpLastFocusedWindow = nullptr;
switch (rKeyCode.GetCode())
{
@@ -603,20 +595,6 @@ IMPL_LINK(FocusManager, ChildEventListener, VclWindowEvent&, rEvent, void)
FocusPanel(aLocation.mnIndex, true);
break;
- case KEY_TAB:
- {
- WindowType aWindowType = pSource->GetType();
- if (mpFirstFocusedContentControl!=nullptr
- && ( mpLastFocusedWindow == mpFirstFocusedContentControl
- && !( WindowType::EDIT == aWindowType || WindowType::SPINFIELD == aWindowType ) ))
- {
- // Move focus back to panel (or deck)
- // title.
- FocusPanel(aLocation.mnIndex, true);
- }
- }
- break;
-
default:
break;
}
@@ -624,16 +602,6 @@ IMPL_LINK(FocusManager, ChildEventListener, VclWindowEvent&, rEvent, void)
return;
}
- case VclEventId::WindowGetFocus:
- // Keep track of focused controls in panel content.
- // Remember the first focused control. When it is later
- // focused again due to pressing the TAB key then the
- // focus is moved to the panel or deck title.
- mpLastFocusedWindow = pSource;
- if (mbObservingContentControlFocus)
- mpFirstFocusedContentControl = pSource;
- break;
-
default:
break;
}