Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-14 08:03:05 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #46891 from godotengine/revert-46409-fix-scale-pivot-jitter

Browse Source 
Revert "Fix flicker in control nodes due to pivot offset"
This commit is contained in:
Rémi Verschelde 2021-03-11 11:58:18 +01:00 committed by GitHub
commit 13a57d8cdf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scene/gui/control.cpp
View File

@ -462,6 +462,11 @@ void Control::_update_canvas_item_transform() {
Transform2D xform = _get_internal_transform();
xform[2] += get_position();
// We use a little workaround to avoid flickering when moving the pivot with _edit_set_pivot()
if (is_inside_tree() && Math::abs(Math::sin(data.rotation * 4.0f)) < 0.00001f && get_viewport()->is_snap_controls_to_pixels_enabled()) {
xform[2] = xform[2].round();
}
VisualServer::get_singleton()->canvas_item_set_transform(get_canvas_item(), xform);
}

1
scene/gui/scroll_container.cpp
View File

@ -315,7 +315,6 @@ void ScrollContainer::_notification(int p_what) {
r.size.height = minsize.height;
}
r.position += ofs;
r.position = r.position.floor();
fit_child_in_rect(c, r);
}