diff options
| author | Max Hilbrunner <mhilbrunner@users.noreply.github.com> | 2018-04-30 19:00:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 19:00:41 +0200 |
| commit | 196fc8599a799eb9aa78961f59b2b622238d9e11 (patch) | |
| tree | 3fbcf3f6c9eece4ed516818b3600ba95903ca745 | |
| parent | f274c8b74b03089c3f6ea87033611cdfd5d08714 (diff) | |
| parent | cca7633739e433259b926224f659b9540e518e0a (diff) | |
Merge pull request #18373 from KidRigger/working
Replaces CTRL with CMD in TileMapEditor for MacOS.
| -rw-r--r-- | editor/plugins/tile_map_editor_plugin.cpp | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/editor/plugins/tile_map_editor_plugin.cpp b/editor/plugins/tile_map_editor_plugin.cpp index 14c584fa35..72b3af5a09 100644 --- a/editor/plugins/tile_map_editor_plugin.cpp +++ b/editor/plugins/tile_map_editor_plugin.cpp @@ -724,7 +724,11 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) { if (mb->get_shift()) { +#ifdef APPLE_STYLE_KEYS + if (mb->get_command()) +#else if (mb->get_control()) +#endif tool = TOOL_RECTANGLE_PAINT; else tool = TOOL_LINE_PAINT; @@ -734,9 +738,11 @@ bool TileMapEditor::forward_gui_input(const Ref<InputEvent> &p_event) { return true; } - +#ifdef APPLE_STYLE_KEYS + if (mb->get_command()) { +#else if (mb->get_control()) { - +#endif tool = TOOL_PICKING; _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")); if (mb->get_shift()) { - +#ifdef APPLE_STYLE_KEYS + if (mb->get_command()) +#else if (mb->get_control()) +#endif tool = TOOL_RECTANGLE_ERASE; else tool = TOOL_LINE_ERASE; |