From 715be3c81b96fcf87c7650501d71480a8743a984 Mon Sep 17 00:00:00 2001
From: crupest <crupest@outlook.com>
Date: Sat, 26 Dec 2020 19:39:24 +0800
Subject: ...

---
 src/ui/helper/ShortcutHub.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/ui/helper/ShortcutHub.cpp')

diff --git a/src/ui/helper/ShortcutHub.cpp b/src/ui/helper/ShortcutHub.cpp
index 823072f2..f35ad0ef 100644
--- a/src/ui/helper/ShortcutHub.cpp
+++ b/src/ui/helper/ShortcutHub.cpp
@@ -85,6 +85,8 @@ void ShortcutHub::OnKeyDown(event::KeyEventArgs& event) {
   ShortcutKeyBind key_bind(event.GetKeyCode(), event.GetKeyModifier());
   const auto& shortcut_list = this->GetShortcutByKeyBind(key_bind);
 
+  bool handled = false;
+
   if constexpr (debug_flags::shortcut) {
     if (shortcut_list.empty()) {
       log::Debug(u"No shortcut for key bind {}.", key_bind.ToString());
@@ -100,12 +102,13 @@ void ShortcutHub::OnKeyDown(event::KeyEventArgs& event) {
         log::Debug(u"Handle {} handled it.", shortcut.name);
       }
 
+      handled = true;
       event.SetHandled();
 
       break;
     } else {
       if constexpr (debug_flags::shortcut) {
-        log::Debug(u"Handle {} disdn't handle it.", shortcut.name);
+        log::Debug(u"Handle {} didn't handle it.", shortcut.name);
       }
     }
   }
@@ -116,5 +119,13 @@ void ShortcutHub::OnKeyDown(event::KeyEventArgs& event) {
                  key_bind.ToString());
     }
   }
+
+  if (!handled) {
+    if constexpr (debug_flags::shortcut) {
+      log::Debug(u"Raise fallback event for unhandled shortcut of key bind {}.",
+                 key_bind.ToString());
+    }
+    fallback_event_.Raise(event);
+  }
 }
 }  // namespace cru::ui::helper
-- 
cgit v1.2.3