From c89a692173eab9531d7e595fa542774ac9a5cad1 Mon Sep 17 00:00:00 2001
From: ShikiSuen <shikisuen@outlook.com>
Date: Sun, 17 Jul 2022 23:15:59 +0800
Subject: [PATCH] KeyHandler // Allow Alt+Up/Dn for candidate rotation.

---
 .../ControllerModules/KeyHandler_HandleInput.swift  | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift b/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift
index cd16f283..db5a6e62 100644
--- a/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift
+++ b/Source/Modules/ControllerModules/KeyHandler_HandleInput.swift
@@ -262,7 +262,7 @@ extension KeyHandler {
 
     // MARK: 用上下左右鍵呼叫選字窗 (Calling candidate window using Up / Down or PageUp / PageDn.)
 
-    if let currentState = state as? InputState.NotEmpty, composer.isEmpty,
+    if let currentState = state as? InputState.NotEmpty, composer.isEmpty, !input.isOptionHold,
       input.isExtraChooseCandidateKey || input.isExtraChooseCandidateKeyReverse || input.isSpace
         || input.isPageDown || input.isPageUp || (input.isTab && mgrPrefs.specifyShiftTabKeyBehavior)
         || (input.isTypingVertical && (input.isVerticalTypingOnlyChooseCandidateKey))
@@ -354,6 +354,17 @@ extension KeyHandler {
     // MARK: AbsorbedArrowKey
 
     if input.isAbsorbedArrowKey || input.isExtraChooseCandidateKey || input.isExtraChooseCandidateKeyReverse {
+      if input.isOptionHold, state.type == .ofInputting {
+        if input.isExtraChooseCandidateKey {
+          return handleInlineCandidateRotation(
+            state: state, reverseModifier: false, stateCallback: stateCallback, errorCallback: errorCallback
+          )
+        } else if input.isExtraChooseCandidateKeyReverse {
+          return handleInlineCandidateRotation(
+            state: state, reverseModifier: true, stateCallback: stateCallback, errorCallback: errorCallback
+          )
+        }
+      }
       return handleAbsorbedArrowKey(state: state, stateCallback: stateCallback, errorCallback: errorCallback)
     }