The keyboard shortcut of zoom in does not work on the JIS keyboard

[Umio-Yasuno]

Describe the bug
The keyboard shortcut of zoom in (Ctrl+PlusEqual) does not work on the JIS keyboard layout.
On the JIS keyboard layout, we need the shift key to type + (Shift+;) or = (Shift+-).

https://en.wikipedia.org/wiki/Japanese_input_method
https://en.wikipedia.org/wiki/Keyboard_layout#Japanese

I have confirmed that this issue will be fixed with the following patch.

diff --git a/crates/egui/src/gui_zoom.rs b/crates/egui/src/gui_zoom.rs
index fb4f9bd..9cb8165 100644
--- a/crates/egui/src/gui_zoom.rs
+++ b/crates/egui/src/gui_zoom.rs
@@ -8,6 +8,8 @@ pub mod kb_shortcuts {

     pub const ZOOM_IN: KeyboardShortcut =
         KeyboardShortcut::new(Modifiers::COMMAND, Key::PlusEquals);
+    pub const ZOOM_IN_WITH_SHIFT: KeyboardShortcut =
+        KeyboardShortcut::new(Modifiers::COMMAND.plus(Modifiers::SHIFT), Key::PlusEquals);
     pub const ZOOM_OUT: KeyboardShortcut = KeyboardShortcut::new(Modifiers::COMMAND, Key::Minus);
     pub const ZOOM_RESET: KeyboardShortcut = KeyboardShortcut::new(Modifiers::COMMAND, Key::Num0);
 }
@@ -21,7 +23,10 @@ pub(crate) fn zoom_with_keyboard(ctx: &Context) {
     if ctx.input_mut(|i| i.consume_shortcut(&kb_shortcuts::ZOOM_RESET)) {
         ctx.set_zoom_factor(1.0);
     } else {
-        if ctx.input_mut(|i| i.consume_shortcut(&kb_shortcuts::ZOOM_IN)) {
+        if ctx.input_mut(|i| {
+            i.consume_shortcut(&kb_shortcuts::ZOOM_IN)
+                || i.consume_shortcut(&kb_shortcuts::ZOOM_IN_WITH_SHIFT)
+        }) {
             zoom_in(ctx);
         }
         if ctx.input_mut(|i| i.consume_shortcut(&kb_shortcuts::ZOOM_OUT)) {

[emilk]

Thanks for the report!

I wonder what a good an general solution to this would be.

Sometimes you want to ignore the SHIFT key when matching a KeyboardShortcut, and sometimes not. In particular, you want to ignore it for Keys that are not always found on a normal keyboard, so that when check for Key::Plus we would ignore SHIFT, but not when checking for Key::A.

In any case, it would be a breaking change

[emilk]

Please try #3769 and see if it helps!

[Umio-Yasuno]

Please try #3769 and see if it helps!

I confirmed that the ZOOM_IN and ZOOM_OUT shortcuts work in #3769.
Thanks!

[2024-01-04T23:06:26Z DEBUG egui_winit::clipboard] Initializing arboard clipboard…
[2024-01-04T23:06:26Z DEBUG egui_winit::clipboard] Cannot init smithay clipboard: the 'wayland' feature of 'egui-winit' is not enabled
[2024-01-04T23:06:28Z TRACE egui_winit] Unknown key: Control
[2024-01-04T23:06:28Z TRACE egui_winit] logical Named(Control) -> None,  physical Code(ControlLeft) -> None
[2024-01-04T23:06:28Z TRACE egui_winit] Unknown key: Shift
[2024-01-04T23:06:28Z TRACE egui_winit] logical Named(Shift) -> None,  physical Code(ShiftLeft) -> None
[2024-01-04T23:06:29Z TRACE egui_winit] logical Character("=") -> Some(Equals),  physical Code(Minus) -> Some(Minus)
[2024-01-04T23:06:29Z TRACE egui_winit] logical Character("=") -> Some(Equals),  physical Code(Minus) -> Some(Minus)
[2024-01-04T23:06:29Z TRACE egui_winit] logical Character("=") -> Some(Equals),  physical Code(Minus) -> Some(Minus)
[2024-01-04T23:06:30Z TRACE egui_winit] logical Character("=") -> Some(Equals),  physical Code(Minus) -> Some(Minus)
[2024-01-04T23:06:31Z TRACE egui_winit] Unknown key: Shift
[2024-01-04T23:06:31Z TRACE egui_winit] logical Named(Shift) -> None,  physical Code(ShiftLeft) -> None
[2024-01-04T23:06:31Z TRACE egui_winit] logical Character("-") -> Some(Minus),  physical Code(Minus) -> Some(Minus)
[2024-01-04T23:06:31Z TRACE egui_winit] logical Character("-") -> Some(Minus),  physical Code(Minus) -> Some(Minus)
[2024-01-04T23:06:31Z TRACE egui_winit] logical Character("-") -> Some(Minus),  physical Code(Minus) -> Some(Minus)
[2024-01-04T23:06:32Z TRACE egui_winit] logical Character("-") -> Some(Minus),  physical Code(Minus) -> Some(Minus)
[2024-01-04T23:06:32Z TRACE egui_winit] Unknown key: Shift
[2024-01-04T23:06:32Z TRACE egui_winit] logical Named(Shift) -> None,  physical Code(ShiftLeft) -> None
[2024-01-04T23:06:33Z TRACE egui_winit] logical Character("+") -> Some(Plus),  physical Code(Semicolon) -> Some(Semicolon)
[2024-01-04T23:06:33Z TRACE egui_winit] logical Character("+") -> Some(Plus),  physical Code(Semicolon) -> Some(Semicolon)
[2024-01-04T23:06:33Z TRACE egui_winit] logical Character("+") -> Some(Plus),  physical Code(Semicolon) -> Some(Semicolon)
[2024-01-04T23:06:33Z TRACE egui_winit] logical Character("+") -> Some(Plus),  physical Code(Semicolon) -> Some(Semicolon)
[2024-01-04T23:06:34Z TRACE egui_winit] Unknown key: Shift
[2024-01-04T23:06:34Z TRACE egui_winit] logical Named(Shift) -> None,  physical Code(ShiftLeft) -> None
[2024-01-04T23:06:34Z TRACE egui_winit] logical Character("0") -> Some(Num0),  physical Code(Digit0) -> Some(Num0)
[2024-01-04T23:06:34Z TRACE egui_winit] logical Character("0") -> Some(Num0),  physical Code(Digit0) -> Some(Num0)
[2024-01-04T23:06:34Z TRACE egui_winit] Unknown key: Control
[2024-01-04T23:06:34Z TRACE egui_winit] logical Named(Control) -> None,  physical Code(ControlLeft) -> None