caleb-brown/Alchemy
1
0
Fork 0
mirror of https://github.com/AnnulusGames/Alchemy.git synced 2025-01-22 08:18:51 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for foldouts overflowing outside of Boxes. See https://github.com/AnnulusGames/Alchemy/issues/30

Browse Source
This commit is contained in:
Level6Rogue 2024-08-17 18:32:00 +10:00
parent 16505a9b8a
commit 0ddca06d86
6 changed files with 70 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
Alchemy/Assets/Alchemy/Editor/BuiltinGroupDrawers.cs
View File

@ -20,6 +20,9 @@ namespace Alchemy.Editor.Drawers
Box box = new();
box.styleSheets.Add(_styleSheet);
box.AddToClassList("group__box");
GUIHelper.ModifyChildFoldouts(box, "group__box__child-foldout");
return box;
}
}
@ -35,6 +38,8 @@ namespace Alchemy.Editor.Drawers
helpBox.styleSheets.Add(_styleSheet);
helpBox.AddToClassList("box-group__help-box");
GUIHelper.ModifyChildFoldouts(helpBox, "box-group__help-box__child-foldout");
return helpBox;
}
@ -115,6 +120,8 @@ namespace Alchemy.Editor.Drawers
tabElements.Add(tabName, element);
keyArrayCache = tabElements.Keys.ToArray();
GUIHelper.ModifyChildFoldouts(element, "tab-group__tab-page__child-foldout");
}
return element;
@ -161,36 +168,45 @@ namespace Alchemy.Editor.Drawers
root.styleSheets.Add(_styleSheet);
root.AddToClassList("horizontal-group__main-element");
static void AdjustLabel(PropertyField element, VisualElement inspector, int childCount)
{
if (element.childCount == 0) return;
if (element.Q<Foldout>() != null) return;
var field = element[0];
field.RemoveFromClassList("unity-base-field__aligned");
var labelElement = field.Q<Label>();
if (labelElement != null)
labelElement.style.width = GUIHelper.CalculateLabelWidth(element, inspector) * 0.8f / childCount;
}
root.schedule.Execute(() =>
root.RegisterCallback<GeometryChangedEvent>(_ =>
{
if (root.childCount <= 1) return;
var visualTree = root.panel.visualTree;
foreach (var field in root.Query<PropertyField>().Build())
{
field.schedule.Execute(() => AdjustLabel(field, visualTree, root.childCount));
AdjustLabel(field, visualTree, root.childCount);
}
foreach (var field in root.Query<GenericField>().Children<PropertyField>().Build())
{
field.schedule.Execute(() => AdjustLabel(field, visualTree, root.childCount));
AdjustLabel(field, visualTree, root.childCount);
}
});
return root;
static void AdjustLabel(PropertyField element, VisualElement inspector, int childCount)
{
if (element.childCount == 0) return;
if (element.Q<Foldout>() != null) return;
var field = element[0];
field.RemoveFromClassList("unity-base-field__aligned");
var labelElement = field.Q<Label>();
if (labelElement != null && !labelElement.ClassListContains("horizontal-group__property-field__label"))
{
labelElement.AddToClassList("horizontal-group__property-field__label");
labelElement.RegisterCallback<GeometryChangedEvent>(_ =>
{
//I'd like to use stylesheets here, but it seems values are set inline somewhere.
//Therefore we too must inline, aggressively.
labelElement.style.minWidth = 0f;
labelElement.style.width = GUIHelper.CalculateLabelWidth(element, inspector) * 0.8f / childCount;
});
}
}
}
}
[CustomGroupDrawer(typeof(InlineGroupAttribute))]

12
Alchemy/Assets/Alchemy/Editor/Internal/GUIHelper.cs
View File

@ -190,5 +190,17 @@ namespace Alchemy.Editor
visualElement.style.minWidth = value;
visualElement.style.width = value;
}
public static void ModifyChildFoldouts(VisualElement element, string className)
{
element.schedule.Execute(() =>
{
foreach (var foldout in element.Query<Foldout>().Build())
{
if (foldout.parent == element || foldout.parent.parent == element)
foldout.AddToClassList(className);
}
});
}
}
}

7
Alchemy/Assets/Alchemy/Editor/Resources/Elements/BoxGroupDrawer-Styles.uss
View File

@ -16,3 +16,10 @@
-unity-font-style: bold;
align-self: stretch;
}
.box-group__help-box__child-foldout {
}
.box-group__help-box__child-foldout > Toggle {
margin-left: 0;
}

7
Alchemy/Assets/Alchemy/Editor/Resources/Elements/GroupDrawer-Styles.uss
View File

@ -5,3 +5,10 @@
padding-right: 2px;
padding-left: 1px;
}
.group__box__child-foldout {
}
.group__box__child-foldout > Toggle {
margin-left: 0;
}

3
Alchemy/Assets/Alchemy/Editor/Resources/Elements/HorizontalGroupDrawer-Styles.uss
View File

@ -2,3 +2,6 @@
width: 100%;
flex-direction: row;
}
.horizontal-group__property-field__label {
}

7
Alchemy/Assets/Alchemy/Editor/Resources/Elements/TabGroupDrawer-Styles.uss
View File

@ -21,3 +21,10 @@
.tab-group__tab-page {
width: 100%;
}
.tab-group__tab-page__child-foldout {
}
.tab-group__tab-page__child-foldout > Toggle {
margin-left: 0;
}