asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #42705 from Calinou/tilemap-editor-fix-osx-tooltip

Browse source 
Fix rectangle paint tooltip for the tilemap editor on macOS
This commit is contained in:
Rémi Verschelde 2020-10-27 14:43:50 +01:00 committed by GitHub
commit 7c27e37997
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/plugins/polygon_2d_editor_plugin.cpp
View file

@ -1333,7 +1333,11 @@ Polygon2DEditor::Polygon2DEditor(EditorNode *p_editor) :
uv_button[UV_MODE_CREATE]->set_tooltip(TTR("Create Polygon")); uv_button[UV_MODE_CREATE]->set_tooltip(TTR("Create Polygon"));
uv_button[UV_MODE_CREATE_INTERNAL]->set_tooltip(TTR("Create Internal Vertex")); uv_button[UV_MODE_CREATE_INTERNAL]->set_tooltip(TTR("Create Internal Vertex"));
uv_button[UV_MODE_REMOVE_INTERNAL]->set_tooltip(TTR("Remove Internal Vertex")); uv_button[UV_MODE_REMOVE_INTERNAL]->set_tooltip(TTR("Remove Internal Vertex"));
#ifdef OSX_ENABLED
uv_button[UV_MODE_EDIT_POINT]->set_tooltip(TTR("Move Points") + "\n" + TTR("Command: Rotate") + "\n" + TTR("Shift: Move All") + "\n" + TTR("Shift+Command: Scale"));
#else
uv_button[UV_MODE_EDIT_POINT]->set_tooltip(TTR("Move Points") + "\n" + TTR("Ctrl: Rotate") + "\n" + TTR("Shift: Move All") + "\n" + TTR("Shift+Ctrl: Scale")); uv_button[UV_MODE_EDIT_POINT]->set_tooltip(TTR("Move Points") + "\n" + TTR("Ctrl: Rotate") + "\n" + TTR("Shift: Move All") + "\n" + TTR("Shift+Ctrl: Scale"));
#endif
uv_button[UV_MODE_MOVE]->set_tooltip(TTR("Move Polygon")); uv_button[UV_MODE_MOVE]->set_tooltip(TTR("Move Polygon"));
uv_button[UV_MODE_ROTATE]->set_tooltip(TTR("Rotate Polygon")); uv_button[UV_MODE_ROTATE]->set_tooltip(TTR("Rotate Polygon"));
uv_button[UV_MODE_SCALE]->set_tooltip(TTR("Scale Polygon")); uv_button[UV_MODE_SCALE]->set_tooltip(TTR("Scale Polygon"));

4
editor/plugins/tile_map_editor_plugin.cpp
View file

@ -2069,7 +2069,11 @@ TileMapEditor::TileMapEditor(EditorNode *p_editor) {
// Tools. // Tools.
paint_button = memnew(ToolButton); paint_button = memnew(ToolButton);
paint_button->set_shortcut(ED_SHORTCUT("tile_map_editor/paint_tile", TTR("Paint Tile"), KEY_P)); paint_button->set_shortcut(ED_SHORTCUT("tile_map_editor/paint_tile", TTR("Paint Tile"), KEY_P));
#ifdef OSX_ENABLED
paint_button->set_tooltip(TTR("Shift+LMB: Line Draw\nShift+Command+LMB: Rectangle Paint"));
#else
paint_button->set_tooltip(TTR("Shift+LMB: Line Draw\nShift+Ctrl+LMB: Rectangle Paint")); paint_button->set_tooltip(TTR("Shift+LMB: Line Draw\nShift+Ctrl+LMB: Rectangle Paint"));
#endif
paint_button->connect("pressed", this, "_button_tool_select", make_binds(TOOL_NONE)); paint_button->connect("pressed", this, "_button_tool_select", make_binds(TOOL_NONE));
paint_button->set_toggle_mode(true); paint_button->set_toggle_mode(true);
toolbar->add_child(paint_button); toolbar->add_child(paint_button);