summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBiBi <47357234+Huberion@users.noreply.github.com>2020-12-28 22:49:18 +0800
committerGitHub <noreply@github.com>2020-12-28 22:49:18 +0800
commit849a8b5f5847feec931fc985fa3f73927b883091 (patch)
treefb217c5b036ddff4a30b95cf13706befbda62ab7
parent8f4c4bb6106e11d4c6fe1d37e5ad294474f6bb0d (diff)
Fix Scrollbar range calculation error
When zoomed in, the right and bottom edges of the resource image will be outside the viewing area.
-rw-r--r--editor/plugins/polygon_2d_editor_plugin.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/editor/plugins/polygon_2d_editor_plugin.cpp b/editor/plugins/polygon_2d_editor_plugin.cpp
index 0584ee894b..3315068674 100644
--- a/editor/plugins/polygon_2d_editor_plugin.cpp
+++ b/editor/plugins/polygon_2d_editor_plugin.cpp
@@ -1052,8 +1052,6 @@ void Polygon2DEditor::_uv_draw() {
if (i < uv_draw_max /*&& polygons.size() == 0 && polygon_create.size() == 0*/) { //if using or creating polygons, do not show outline (will show polygons instead)
uv_edit_draw->draw_line(mtx.xform(uvs[i]), mtx.xform(next_point), poly_line_color, Math::round(EDSCALE));
}
-
- rect.expand_to(mtx.basis_xform(uvs[i]));
}
for (int i = 0; i < polygons.size(); i++) {
@@ -1160,8 +1158,8 @@ void Polygon2DEditor::_uv_draw() {
uv_edit_draw->draw_circle(bone_paint_pos, bone_paint_radius->get_value() * EDSCALE, Color(1, 1, 1, 0.1));
}
- rect.position -= uv_edit_draw->get_size();
- rect.size += uv_edit_draw->get_size() * 2.0;
+ rect.position = -uv_edit_draw->get_size();
+ rect.size = uv_edit_draw->get_size() * 2.0 + base_tex->get_size() * uv_draw_zoom;
updating_uv_scroll = true;