Skip to content

Commit fdfa1f2

Browse files
committed
Merge pull request #101098 from KoBeWi/rect_pretender
Don't show "Drawing rect" when not actually drawing
2 parents b401a87 + f8fd156 commit fdfa1f2

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

editor/plugins/tiles/tile_map_layer_editor.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -800,6 +800,7 @@ void TileMapLayerEditorTilesPlugin::forward_canvas_draw_over_viewport(Control *p
800800
Transform2D xform = CanvasItemEditor::get_singleton()->get_canvas_transform() * edited_layer->get_global_transform_with_canvas();
801801
Vector2 mpos = edited_layer->get_local_mouse_position();
802802
Vector2i tile_shape_size = tile_set->get_tile_size();
803+
bool drawing_rect = false;
803804

804805
// Draw the selection.
805806
if ((tiles_bottom_panel->is_visible_in_tree() || patterns_bottom_panel->is_visible_in_tree()) && tool_buttons_group->get_pressed_button() == select_tool_button) {
@@ -893,6 +894,7 @@ void TileMapLayerEditorTilesPlugin::forward_canvas_draw_over_viewport(Control *p
893894
} else if (drag_type == DRAG_TYPE_RECT) {
894895
// Preview for a rect pattern.
895896
preview = _draw_rect(tile_set->local_to_map(drag_start_mouse_pos), tile_set->local_to_map(mpos), drag_erasing);
897+
drawing_rect = !preview.is_empty();
896898
expand_grid = true;
897899
} else if (tool_buttons_group->get_pressed_button() == bucket_tool_button && drag_type == DRAG_TYPE_NONE) {
898900
// Preview for a fill pattern.
@@ -1003,7 +1005,7 @@ void TileMapLayerEditorTilesPlugin::forward_canvas_draw_over_viewport(Control *p
10031005
Point2 msgpos = Point2(20 * EDSCALE, p_overlay->get_size().y - 20 * EDSCALE);
10041006

10051007
String text = tile_set->local_to_map(edited_layer->get_local_mouse_position());
1006-
if (drag_type == DRAG_TYPE_RECT) {
1008+
if (drawing_rect) {
10071009
Vector2i size = tile_set->local_to_map(edited_layer->get_local_mouse_position()) - tile_set->local_to_map(drag_start_mouse_pos);
10081010
text += vformat(" %s (%dx%d)", TTR("Drawing Rect:"), ABS(size.x) + 1, ABS(size.y) + 1);
10091011
}

0 commit comments

Comments
 (0)