Fix most other prompter/editor focus switching issues

Fix #281
Cuperino · Sep 21, 2024 · 4117761 · 4117761
1 parent 40ebd37
commit 4117761
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/kirigami_ui/PrompterPage.qml b/src/kirigami_ui/PrompterPage.qml
@@ -71,10 +71,7 @@ Kirigami.Page {
         Kirigami.Action {
             id: promptingButton
             text: i18n("Start prompter")
-            onTriggered: {
-                prompterPage.focus = true
-                prompter.toggle()
-            }
+            onTriggered: prompter.toggle()
         },
         Kirigami.Action {
             id: decreaseVelocityButton

diff --git a/src/prompter/Prompter.qml b/src/prompter/Prompter.qml
@@ -244,6 +244,7 @@ Flickable {
     }
 
     function restoreFocus() {
+        prompterPage.focus = true
         if (parseInt(state)===Prompter.States.Editing)
             editor.focus = !root.__isMobile
         else
@@ -314,6 +315,7 @@ Flickable {
             //if (root.passiveNotifications)
             //    showPassiveNotification(i18n("Increase Velocity"));
         }
+        prompter.restoreFocus()
     }
 
     function decreaseVelocity(event) {
@@ -328,6 +330,7 @@ Flickable {
             //if (root.passiveNotifications)
             //    showPassiveNotification(i18n("Decrease Velocity"));
         }
+        prompter.restoreFocus()
     }
 
     function editMarker(cursorPosition, fragmentLength) {
@@ -653,6 +656,7 @@ Flickable {
 
                 function toggleEditorFocus(mouse) {
                     if (!editor.activeFocus) {
+                        prompter.restoreFocus();
                         editor.focus = true;
                         editor.cursorPosition = editor.positionAt(mouse.x, mouse.y)
                         cursorAutoHide.reset();