Skip to content

Commit

Permalink
Added ImGuiMod_Shortcut which is ImGuiMod_Super on Mac and ImGuiMod_C…
Browse files Browse the repository at this point in the history
…trl otherwise. (ocornut#456)
  • Loading branch information
ocornut committed Sep 26, 2022
1 parent fd408c9 commit 83a0030
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
1 change: 1 addition & 0 deletions docs/CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ Other Changes:
bar boundaries (bug in 1.88). (#5652).
- Tabs: Enforcing minimum size of 1.0f, fixed asserting on zero-tab widths. (#5572)
- Window: Fixed a potential crash when appending to a child window. (#5515, #3496, #4797) [@rokups]
- IO: Added ImGuiMod_Shortcut which is ImGuiMod_Super on Mac and ImGuiMod_Ctrl otherwise. (#456)
- IO: Added ImGuiKey_MouseXXX aliases for mouse buttons/wheel so all operations done on ImGuiKey
can apply to mouse data as well. (#4921)
- Menus: Fixed incorrect sub-menu parent association when opening a menu by closing another.
Expand Down
5 changes: 5 additions & 0 deletions imgui.h
Original file line number Diff line number Diff line change
Expand Up @@ -1459,6 +1459,11 @@ enum ImGuiKey : int
ImGuiMod_Alt = 1 << 14, // Option/Menu
ImGuiMod_Super = 1 << 15, // Cmd/Super/Windows
ImGuiMod_Mask_ = 0xF000,
#if defined(__APPLE__)
ImGuiMod_Shortcut = ImGuiMod_Super,
#else
ImGuiMod_Shortcut = ImGuiMod_Ctrl,
#endif

// [Internal] Prior to 1.87 we required user to fill io.KeysDown[512] using their own native index + the io.KeyMap[] array.
// We are ditching this method but keeping a legacy path for user code doing e.g. IsKeyPressed(MY_NATIVE_KEY_CODE)
Expand Down

0 comments on commit 83a0030

Please sign in to comment.