Переглянути джерело

Merge pull request #18373 from KidRigger/working

Replaces CTRL with CMD in TileMapEditor for MacOS.
Max Hilbrunner 7 роки тому
батько
коміт
196fc8599a
1 змінених файлів з 12 додано та 3 видалено
  1. 12 3
      editor/plugins/tile_map_editor_plugin.cpp

+ 12 - 3
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()) {
 					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;