godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaces CTRL with CMD in TileMapEditor for MacOS.

Browse Source 
Replacing CTRL with CMD makes sense dure to consistency
with MacOS and avoiding conflict with the accessibility
hotkey (ctrl+lmb = rmb)

Fixes: #18238
This commit is contained in:
Anish 2018-04-23 19:25:36 +05:30
parent 1c419531a0
commit cca7633739
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
editor/plugins/tile_map_editor_plugin.cpp
View File

@ -724,7 +724,11 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
if (mb->get_shift()) { if (mb->get_shift()) {
#ifdef APPLE_STYLE_KEYS
if (mb->get_command())
#else
if (mb->get_control()) if (mb->get_control())
#endif
tool = TOOL_RECTANGLE_PAINT; tool = TOOL_RECTANGLE_PAINT;
else else
tool = TOOL_LINE_PAINT; tool = TOOL_LINE_PAINT;
@ -734,9 +738,11 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
return true; return true;
} }
#ifdef APPLE_STYLE_KEYS
if (mb->get_command()) {
#else
if (mb->get_control()) { if (mb->get_control()) {
#endif
tool = TOOL_PICKING; tool = TOOL_PICKING;
_pick_tile(over_tile); _pick_tile(over_tile);
@ -940,8 +946,11 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
undo_redo->add_undo_method(node, "set", "tile_data", node->get("tile_data")); undo_redo->add_undo_method(node, "set", "tile_data", node->get("tile_data"));
if (mb->get_shift()) { if (mb->get_shift()) {
#ifdef APPLE_STYLE_KEYS
if (mb->get_command())
#else
if (mb->get_control()) if (mb->get_control())
#endif
tool = TOOL_RECTANGLE_ERASE; tool = TOOL_RECTANGLE_ERASE;
else else
tool = TOOL_LINE_ERASE; tool = TOOL_LINE_ERASE;