2
0
Эх сурвалжийг харах

Merge pull request #46409 from asheraryam/fix-scale-pivot-jitter

Fix flicker in control nodes due to pivot offset
Rémi Verschelde 4 жил өмнө
parent
commit
9ee835ac93

+ 0 - 5
scene/gui/control.cpp

@@ -462,11 +462,6 @@ 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 - 0
scene/gui/scroll_container.cpp

@@ -315,6 +315,7 @@ 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);
 		}