tdf#137777 Writer: fix keyboard navigation of Navigator

This patch:

-Splits the first row of the Navigator panel into four toolbar controls
to make keyboard navigation possible.

-Makes an Escape key press, when focus is in the sidebar Navigator
'Navigate By' control, result in keyboard focus on the content panel
title, which in the Navigator deck/panel case is the deck title bar.

-Fixes spacing issues of first row controls.

-Fixes 'Navigate By' listbox/combobox keyboard use.

-Keeps focus on previous/next scroll button when enter key is used to
activate the button.

Gtk3 has problems with focusing to title bar and wrapping keyboard
focus. This has been left to be fixed by a separate patch.

Change-Id: Ic9d3a35f2b8c31a209947a1fe61094ddafee4f42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105574
Tested-by: Jenkins
Reviewed-by: Jim Raykowski <raykowj@gmail.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index fad3aa2a4a2c..2ac47cd7efb7 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2028,11 +2028,11 @@ void SwContentTree::Display( bool bActive )
         m_bIsLastReadOnly = bReadOnly;
         bool bDisable =  pShell == nullptr || bReadOnly;
         SwNavigationPI* pNavi = GetParentWindow();
-        pNavi->m_xContent3ToolBox->set_item_sensitive("chapterup", !bDisable);
-        pNavi->m_xContent3ToolBox->set_item_sensitive("chapterdown", !bDisable);
-        pNavi->m_xContent3ToolBox->set_item_sensitive("promote", !bDisable);
-        pNavi->m_xContent3ToolBox->set_item_sensitive("demote", !bDisable);
-        pNavi->m_xContent2ToolBox->set_item_sensitive("reminder", !bDisable);
+        pNavi->m_xContent6ToolBox->set_item_sensitive("chapterup", !bDisable);
+        pNavi->m_xContent6ToolBox->set_item_sensitive("chapterdown", !bDisable);
+        pNavi->m_xContent6ToolBox->set_item_sensitive("promote", !bDisable);
+        pNavi->m_xContent6ToolBox->set_item_sensitive("demote", !bDisable);
+        pNavi->m_xContent5ToolBox->set_item_sensitive("reminder", !bDisable);
     }
 
     if (pShell)
@@ -2403,7 +2403,7 @@ void SwContentTree::ToggleToRoot()
         Display(State::HIDDEN != m_eState);
     }
     m_pConfig->SetRootType( m_nRootType );
-    weld::Toolbar* pBox = GetParentWindow()->m_xContent2ToolBox.get();
+    weld::Toolbar* pBox = GetParentWindow()->m_xContent5ToolBox.get();
     pBox->set_item_active("root", m_bIsRoot);
 }
 
@@ -4006,10 +4006,10 @@ void SwContentTree::Select()
         }
     }
     SwNavigationPI* pNavi = GetParentWindow();
-    pNavi->m_xContent3ToolBox->set_item_sensitive("chapterup",  bEnable);
-    pNavi->m_xContent3ToolBox->set_item_sensitive("chapterdown", bEnable);
-    pNavi->m_xContent3ToolBox->set_item_sensitive("promote", bEnable);
-    pNavi->m_xContent3ToolBox->set_item_sensitive("demote", bEnable);
+    pNavi->m_xContent6ToolBox->set_item_sensitive("chapterup",  bEnable);
+    pNavi->m_xContent6ToolBox->set_item_sensitive("chapterdown", bEnable);
+    pNavi->m_xContent6ToolBox->set_item_sensitive("promote", bEnable);
+    pNavi->m_xContent6ToolBox->set_item_sensitive("demote", bEnable);
 }
 
 void SwContentTree::SetRootType(ContentTypeId nType)