macos: hide long press options; change trigger key (#1113)

fcitx · Aug 27, 2024 · ce6227b · ce6227b
1 parent cd03fee
commit ce6227b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/im/keyboard/keyboard.h b/src/im/keyboard/keyboard.h
@@ -90,14 +90,15 @@ FCITX_CONFIGURATION(
            "matching sequence.")}};
     SubConfigOption spell{this, "Spell", _("Spell"),
                           "fcitx://config/addon/spell"};
-    Option<bool> enableLongPress{this, "EnableLongPress",
-                                 _("Type special characters with long press"),
-                                 false};
-    Option<std::vector<std::string>> blocklistApplicationForLongPress{
-        this,
-        "LongPressBlocklist",
-        _("Applications disabled for long press"),
-        {"konsole"}};
+    ConditionalHidden<isApple(), Option<bool>> enableLongPress{
+        this, "EnableLongPress", _("Type special characters with long press"),
+        false};
+    ConditionalHidden<isApple(), Option<std::vector<std::string>>>
+        blocklistApplicationForLongPress{
+            this,
+            "LongPressBlocklist",
+            _("Applications disabled for long press"),
+            {"konsole"}};
     ConditionalHidden<isApple(), SubConfigOption> longPress{
         this, "LongPress", _("Long Press behavior"),
         "fcitx://config/addon/keyboard/longpress"};);

diff --git a/src/lib/fcitx/globalconfig.cpp b/src/lib/fcitx/globalconfig.cpp
@@ -33,7 +33,8 @@ FCITX_CONFIGURATION(
         this,
         "TriggerKeys",
         _("Trigger Input Method"),
-        {Key("Control+space"), Key("Zenkaku_Hankaku"), Key("Hangul")},
+        {isApple() ? Key("Control+Shift_L") : Key("Control+space"),
+         Key("Zenkaku_Hankaku"), Key("Hangul")},
         KeyListConstrain({KeyConstrainFlag::AllowModifierLess,
                           KeyConstrainFlag::AllowModifierOnly})};
     Option<bool> enumerateWithTriggerKeys{