GoaLitiuM/FlaxEngine
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'Tryibion-scale-default'

Browse Source
This commit is contained in:
Wojtek Figat
2023-12-06 12:51:29 +01:00
parent 84e25a9e90 af4a6b80a8
commit af4c662738
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Source/Editor/SceneGraph/Actors/UICanvasNode.cs
View File

@@ -31,13 +31,26 @@ namespace FlaxEditor.SceneGraph.Actors
// Rotate to match the space (GUI uses upper left corner as a root)
Actor.LocalOrientation = Quaternion.Euler(0, -180, -180);
var uiControl = new UIControl
bool canSpawn = true;
foreach (var uiControl in Actor.GetChildren<UIControl>())
{
Name = "Canvas Scalar",
Transform = Actor.Transform,
Control = new CanvasScaler()
};
Root.Spawn(uiControl, Actor);
if (uiControl.Get<CanvasScaler>() == null)
continue;
canSpawn = false;
break;
}
if (canSpawn)
{
var uiControl = new UIControl
{
Name = "Canvas Scalar",
Transform = Actor.Transform,
Control = new CanvasScaler()
};
Root.Spawn(uiControl, Actor);
}
_treeNode.Expand();
}
/// <inheritdoc />

4
Source/Engine/UI/GUI/CanvasScaler.cs
View File

@@ -98,8 +98,8 @@ namespace FlaxEngine.GUI
private float _scale = 1.0f;
private float _scaleFactor = 1.0f;
private float _physicalUnitSize = 1.0f;
private Float2 _resolutionMin = new Float2(1, 1);
private Float2 _resolutionMax = new Float2(10000, 10000);
private Float2 _resolutionMin = new Float2(640, 480);
private Float2 _resolutionMax = new Float2(7680, 4320);
/// <summary>
/// Gets the current UI scale. Computed based on the setup when performing layout.