LanguageSidebar: navigate/select language with keyboard; enable accessibility; selected indicator; remember previous focused item

1 files changed, 4 insertions, 0 deletions

diff --git a/main.qml b/main.qml
index 280a54f3..ccf87ee0 100644
--- a/main.qml
+++ b/main.qml
@@ -62,6 +62,7 @@ ApplicationWindow {
     minimumHeight: 450
 
     property var currentItem
+    property var previousActiveFocusItem
     property bool hideBalanceForced: false
     property bool ctrlPressed: false
     property alias persistentSettings : persistentSettings
@@ -1942,6 +1943,7 @@ ApplicationWindow {
 
     function toggleLanguageView(){
         languageSidebar.visible ? languageSidebar.close() : languageSidebar.open();
+        languageSidebar.selectCurrentLanguage()
         resetLanguageFields()
     }
 
@@ -2357,6 +2359,8 @@ ApplicationWindow {
     MoneroComponents.LanguageSidebar {
         id: languageSidebar
         dragMargin: 0
+        onAboutToShow: previousActiveFocusItem = activeFocusItem;
+        onClosed: { if (previousActiveFocusItem) previousActiveFocusItem.forceActiveFocus() }
     }
 
     MoneroComponents.MenuBar { }