rename

Author: eagleoflqj

im/pinyin/pinyin.cpp

@@ -1950,10 +1950,11 @@ void PinyinEngine::keyEvent(const InputMethodEntry &entry, KeyEvent &event) {
         resetPredict(inputContext);
         if (event.key().check(FcitxKey_Escape) ||
             (event.key().check(FcitxKey_BackSpace) &&
-             (*config_.treatBackspaceAsEscapeOnPrediction ==
-                  TreatBackspaceAsEscapeOnPrediction::Yes ||
-              (*config_.treatBackspaceAsEscapeOnPrediction ==
-                   TreatBackspaceAsEscapeOnPrediction::WithVirtualKeyboard &&
+             (*config_.backspaceBehaviorOnPrediction ==
+                  BackspaceBehaviorOnPrediction::OnlyClearCandidates ||
+              (*config_.backspaceBehaviorOnPrediction ==
+                   BackspaceBehaviorOnPrediction::
+                       BackspaceWhenNotUsingOnScreenKeyboard &&
                event.isVirtual()))) ||
             event.key().check(FcitxKey_Delete)) {
             event.filterAndAccept();

im/pinyin/pinyin.h

@@ -98,10 +98,16 @@ enum class PreeditMode { No, ComposingPinyin, CommitPreview };
 FCITX_CONFIG_ENUM_NAME_WITH_I18N(PreeditMode, N_("Do not show"),
                                  N_("Composing pinyin"), N_("Commit preview"))
 
-enum class TreatBackspaceAsEscapeOnPrediction { No, WithVirtualKeyboard, Yes };
+enum class BackspaceBehaviorOnPrediction {
+    OnlyClearCandidates,
+    ClearCandidatesAndBackspace,
+    BackspaceWhenNotUsingOnScreenKeyboard
+};
 
-FCITX_CONFIG_ENUM_NAME_WITH_I18N(TreatBackspaceAsEscapeOnPrediction, N_("No"),
-                                 N_("With virtual keyboard"), N_("Yes"))
+FCITX_CONFIG_ENUM_NAME_WITH_I18N(
+    BackspaceBehaviorOnPrediction, N_("Only Clear candidates"),
+    N_("Clear candidates & backspace"),
+    N_("Backspace when not using on-screen keyboard"))
 
 enum class CorrectionLayout {
     None,
@@ -193,12 +199,12 @@ FCITX_CONFIGURATION(
                                    isAndroid()};
     Option<int, IntConstrain> predictionSize{
         this, "PredictionSize", _("Prediction Size"), 49, IntConstrain(3, 100)};
-    OptionWithAnnotation<TreatBackspaceAsEscapeOnPrediction,
-                         TreatBackspaceAsEscapeOnPredictionI18NAnnotation>
-        treatBackspaceAsEscapeOnPrediction{
-            this, "TreatBackspaceAsEscapeOnPrediction",
-            _("Treat BackSpace as Escape on prediction"),
-            TreatBackspaceAsEscapeOnPrediction::WithVirtualKeyboard};
+    OptionWithAnnotation<BackspaceBehaviorOnPrediction,
+                         BackspaceBehaviorOnPredictionI18NAnnotation>
+        backspaceBehaviorOnPrediction{
+            this, "BackspaceBehaviorOnPrediction",
+            _("Backspace behavior on prediction"),
+            BackspaceBehaviorOnPrediction::BackspaceWhenNotUsingOnScreenKeyboard};
     OptionWithAnnotation<SwitchInputMethodBehavior,
                          SwitchInputMethodBehaviorI18NAnnotation>
         switchInputMethodBehavior{this, "SwitchInputMethodBehavior",