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

Merge branch '1.2' into ui-achorpopup-shiftctrl-modes

Browse Source
This commit is contained in:
Nejcraft
2021-04-07 11:20:20 +02:00
committed by GitHub
parent 41a873450e 772af752d2
commit f24cb34e3f
2 changed files with 46 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Editor/CustomEditors/Dedicated/UIControlEditor.cs
View File

@@ -32,7 +32,7 @@ namespace FlaxEditor.CustomEditors.Dedicated
if (_presets != value)
{
_presets = value;
OnPresetsChanged();
TooltipText = CustomEditorsUtil.GetPropertyNameUI(_presets.ToString());
}
}
}
@@ -463,9 +463,9 @@ namespace FlaxEditor.CustomEditors.Dedicated
private void BuildLocationSizeOffsets(LayoutElementsContainer horUp, LayoutElementsContainer horDown, bool xEq, bool yEq, ScriptType[] valueTypes)
{
ScriptMemberInfo xInfo = valueTypes[0].GetProperty("X");
ScriptMemberInfo xInfo = valueTypes[0].GetProperty("LocalX");
ItemInfo xItem = new ItemInfo(xInfo);
ScriptMemberInfo yInfo = valueTypes[0].GetProperty("Y");
ScriptMemberInfo yInfo = valueTypes[0].GetProperty("LocalY");
ItemInfo yItem = new ItemInfo(yInfo);
ScriptMemberInfo widthInfo = valueTypes[0].GetProperty("Width");
ItemInfo widthItem = new ItemInfo(widthInfo);