Skip to content

Commit 89d57ad

Browse files
authored
update for deprecated UIToolkit transform properties (#129)
1 parent fd1a412 commit 89d57ad

File tree

1 file changed

+40
-2
lines changed

1 file changed

+40
-2
lines changed

Runtime/Frameworks/UIToolkit/Components/UIToolkitComponent.cs

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,11 +238,20 @@ protected override void ApplyStylesSelf()
238238

239239
// Transforms
240240

241+
#if UNITY_6000_2_OR_NEWER
242+
if (computed.HasValue(StyleProperties.scale)) TargetElement.style.scale = computed.scale;
243+
else TargetElement.style.scale = Vector3.one;
244+
245+
if (computed.HasValue(StyleProperties.rotate)) TargetElement.style.rotate = Quaternion.Euler(computed.rotate);
246+
else TargetElement.style.rotate = Quaternion.identity;
247+
#else
241248
if (computed.HasValue(StyleProperties.scale)) TargetElement.transform.scale = computed.scale;
242249
else TargetElement.transform.scale = Vector3.one;
243250

244251
if (computed.HasValue(StyleProperties.rotate)) TargetElement.transform.rotation = Quaternion.Euler(computed.rotate);
245252
else TargetElement.transform.rotation = Quaternion.identity;
253+
#endif
254+
246255

247256

248257

@@ -271,19 +280,41 @@ protected override void ApplyStylesSelf()
271280
var pivotY = origin.Y.Unit == YogaUnit.Percent ? (origin.Y.Value / 100) : origin.Y.Unit == YogaUnit.Point ? (origin.Y.Value / rect.y) : 0.5f;
272281
var pivot = new Vector3(pivotX, pivotY, 0);
273282

274-
if (pivot == Vector3.zero) TargetElement.transform.position = translate;
283+
284+
if (pivot == Vector3.zero)
285+
{
286+
#if UNITY_6000_2_OR_NEWER
287+
288+
TargetElement.style.translate = translate;
289+
#else
290+
TargetElement.transform.position = translate;
291+
#endif
292+
}
293+
294+
275295
else
276296
{
277297
Vector3 deltaPosition = -pivot; // get change in pivot
278298
deltaPosition.Scale(rect); // apply sizing
299+
300+
#if UNITY_6000_2_OR_NEWER
301+
deltaPosition.Scale(TargetElement.resolvedStyle.scale.value); // apply scaling
302+
deltaPosition = Quaternion.AngleAxis(TargetElement.resolvedStyle.rotate.angle.value, Vector3.forward) * deltaPosition; // apply rotation
303+
#else
279304
deltaPosition.Scale(TargetElement.transform.scale); // apply scaling
280305
deltaPosition = TargetElement.transform.rotation * deltaPosition; // apply rotation
306+
#endif
281307

282308
var counter = new Vector3(pivot.x, pivot.y, 0);
283309
counter.Scale(rect);
284310

285311
var pos = deltaPosition + translate + counter;
312+
313+
#if UNITY_6000_2_OR_NEWER
314+
TargetElement.style.translate = new Vector3(pos.x, pos.y, 0);
315+
#else
286316
TargetElement.transform.position = new Vector3(pos.x, pos.y, 0);
317+
#endif
287318
}
288319

289320
#if UNITY_2021_2_OR_NEWER
@@ -293,7 +324,14 @@ protected override void ApplyStylesSelf()
293324
TargetElement.style.transformOrigin = new TransformOrigin(0, 0, 0);
294325
#endif
295326
}
296-
else TargetElement.transform.position = translate;
327+
else
328+
{
329+
#if UNITY_6000_2_OR_NEWER
330+
TargetElement.style.translate = translate;
331+
#else
332+
TargetElement.transform.position = translate;
333+
#endif
334+
}
297335

298336
TargetElement.pickingMode = computed.pointerEvents == PointerEvents.None ? PickingMode.Ignore : PickingMode.Position;
299337
}

0 commit comments

Comments
 (0)