From ca7669c460258f16090100924906e589e4b00158 Mon Sep 17 00:00:00 2001
From: Qijia Liu <liumeo@pku.edu.cn>
Date: Mon, 9 Sep 2024 13:59:01 -0400
Subject: [PATCH] fix: default TriggerKeys; Shift_L display; hide long press
 options (#187)

---
 fcitx5                       |  2 +-
 src/config/keyrecorder.swift | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/fcitx5 b/fcitx5
index 2e72254..c36dc4c 160000
--- a/fcitx5
+++ b/fcitx5
@@ -1 +1 @@
-Subproject commit 2e72254c66dc9479dfaafa208be2c93cf32daec6
+Subproject commit c36dc4c473c405cea27148df667a5667c0e38fdb
diff --git a/src/config/keyrecorder.swift b/src/config/keyrecorder.swift
index 36591f8..fd86756 100644
--- a/src/config/keyrecorder.swift
+++ b/src/config/keyrecorder.swift
@@ -58,13 +58,12 @@ func shortcutRepr(_ key: String, _ modifiers: NSEvent.ModifierFlags, _ code: UIn
   var desc = ""
   if modifiers.contains(.control) { desc += "⌃" }
   if modifiers.contains(.option) { desc += "⌥" }
-  if modifiers.contains(.shift) {
-    // Only when Shift is main key we distinguish L/R.
-    if code == 0x3c {
-      desc += "⬆"  // Shift_R
-    } else {
-      desc += "⇧"  // Shift_L
-    }
+  // There could be Shift_L or Shift+Shift_L
+  // Only when Shift is main key we distinguish L/R.
+  if code == 0x3c {
+    desc += "⬆"  // Shift_R
+  } else if code == 0x38 || modifiers.contains(.shift) {
+    desc += "⇧"  // Shift_L
   }
   if modifiers.contains(.command) { desc += "⌘" }
   // Use uppercase to match menu.