85 lines
3.3 KiB
Diff
85 lines
3.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Cheng Zhao <zcbenz@gmail.com>
|
|
Date: Thu, 4 Oct 2018 14:57:02 -0700
|
|
Subject: fix: improve shortcut text of Accelerator
|
|
|
|
This patch makes three changes to Accelerator::GetShortcutText to improve shortcut display text in menus:
|
|
|
|
1. Ctrl-Alt-<Key> accelerators show as Ctrl-Alt-<Key> instead of as Ctrl-<Key>
|
|
2. F2-F24 accelerators show up as such
|
|
3. Ctrl-Shift-= and Ctrl-Plus show up as such
|
|
|
|
diff --git a/ui/base/accelerators/accelerator.cc b/ui/base/accelerators/accelerator.cc
|
|
index 9fca6ff3e62204095ff0edc6fafce3a61cd2ff5c..089f8b818018a600cc8c90811f09374a1f702d8b 100644
|
|
--- a/ui/base/accelerators/accelerator.cc
|
|
+++ b/ui/base/accelerators/accelerator.cc
|
|
@@ -11,6 +11,7 @@
|
|
#include "base/i18n/rtl.h"
|
|
#include "base/notreached.h"
|
|
#include "base/strings/string_util.h"
|
|
+#include "base/strings/stringprintf.h"
|
|
#include "base/strings/utf_string_conversions.h"
|
|
#include "build/build_config.h"
|
|
#include "build/chromeos_buildflags.h"
|
|
@@ -238,6 +239,11 @@ std::u16string Accelerator::GetShortcutText() const {
|
|
#endif
|
|
|
|
if (shortcut.empty()) {
|
|
+ // When a shifted char is explicitly specified, for example Ctrl+Plus,
|
|
+ // use the shifted char directly.
|
|
+ if (shifted_char) {
|
|
+ shortcut += *shifted_char;
|
|
+ } else {
|
|
#if BUILDFLAG(IS_WIN)
|
|
// Our fallback is to try translate the key code to a regular character
|
|
// unless it is one of digits (VK_0 to VK_9). Some keyboard
|
|
@@ -261,6 +267,10 @@ std::u16string Accelerator::GetShortcutText() const {
|
|
shortcut +=
|
|
static_cast<std::u16string::value_type>(base::ToUpperASCII(c));
|
|
#endif
|
|
+ }
|
|
+ if (key_code_ > VKEY_F1 && key_code_ <= VKEY_F24)
|
|
+ shortcut = base::UTF8ToUTF16(
|
|
+ base::StringPrintf("F%d", key_code_ - VKEY_F1 + 1));
|
|
}
|
|
|
|
#if BUILDFLAG(IS_MAC)
|
|
@@ -447,7 +457,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
|
|
const std::u16string& shortcut) const {
|
|
std::u16string result = shortcut;
|
|
|
|
- if (IsShiftDown())
|
|
+ if (!shifted_char && IsShiftDown())
|
|
result = ApplyModifierToAcceleratorString(result, IDS_APP_SHIFT_KEY);
|
|
|
|
// Note that we use 'else-if' in order to avoid using Ctrl+Alt as a shortcut.
|
|
@@ -455,7 +465,7 @@ std::u16string Accelerator::ApplyLongFormModifiers(
|
|
// more information.
|
|
if (IsCtrlDown())
|
|
result = ApplyModifierToAcceleratorString(result, IDS_APP_CTRL_KEY);
|
|
- else if (IsAltDown())
|
|
+ if (IsAltDown())
|
|
result = ApplyModifierToAcceleratorString(result, IDS_APP_ALT_KEY);
|
|
|
|
if (IsCmdDown()) {
|
|
diff --git a/ui/base/accelerators/accelerator.h b/ui/base/accelerators/accelerator.h
|
|
index e0d9df439d120c0a47f55666b3818c7ba6796e70..283c6283f5aeaae1a5436e5fbb17ce2db4a9034e 100644
|
|
--- a/ui/base/accelerators/accelerator.h
|
|
+++ b/ui/base/accelerators/accelerator.h
|
|
@@ -16,6 +16,7 @@
|
|
#include <utility>
|
|
|
|
#include "base/component_export.h"
|
|
+#include "third_party/abseil-cpp/absl/types/optional.h"
|
|
#include "base/time/time.h"
|
|
#include "build/build_config.h"
|
|
#include "ui/events/event_constants.h"
|
|
@@ -130,6 +131,8 @@ class COMPONENT_EXPORT(UI_BASE) Accelerator {
|
|
return interrupted_by_mouse_event_;
|
|
}
|
|
|
|
+ absl::optional<char16_t> shifted_char;
|
|
+
|
|
private:
|
|
friend class AcceleratorTestMac;
|
|
std::u16string ApplyLongFormModifiers(const std::u16string& shortcut) const;
|