Factory 용 Setting 모달 개발 완료
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
<ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xmlns:utk="UVC.UIToolkit" editor-extension-mode="False">
|
||||
<ui:VisualElement name="root" style="padding-left: 20px;">
|
||||
<utk:UTKReordableTabList name="tab-list" />
|
||||
<utk:UTKReordableTabList name="tab-list" style="background-color: transparent; border-width: 0; padding: 0;" />
|
||||
</ui:VisualElement>
|
||||
</ui:UXML>
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
padding: var(--space-s) var(--space-m);
|
||||
padding-left: 0;
|
||||
min-height: 36px;
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
||||
@@ -26,35 +26,11 @@
|
||||
|
||||
.reordable-tab-list > .utk-tabview {
|
||||
flex-grow: 1;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.reordable-tab-list > .utk-tabview > .unity-tab-view__header-container {
|
||||
flex-direction: row;
|
||||
border-right-width: 0;
|
||||
border-top-width: 0;
|
||||
border-left-width: 0;
|
||||
border-bottom-width: var(--border-width);
|
||||
border-bottom-color: var(--color-border);
|
||||
}
|
||||
|
||||
.reordable-tab-list > .utk-tabview > .unity-tab-view__content-container {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.reordable-tab-list > .utk-tabview .unity-tab__header {
|
||||
margin-right: var(--space-s);
|
||||
margin-bottom: 0;
|
||||
position: relative;
|
||||
}
|
||||
|
||||
.reordable-tab-list > .utk-tabview .unity-tab__header-underline {
|
||||
left: 0;
|
||||
right: 0;
|
||||
bottom: 0;
|
||||
top: auto;
|
||||
width: auto;
|
||||
height: 2px;
|
||||
margin-top: var(--space-s);
|
||||
}
|
||||
|
||||
/* ===================================
|
||||
|
||||
@@ -111,7 +111,40 @@ namespace UVC.UIToolkit
|
||||
|
||||
_tabView = new UTKTabView();
|
||||
_tabView.AddToClassList("reordable-tab-list__tabview");
|
||||
_tabView.Align = TabAlign.Top;
|
||||
Add(_tabView);
|
||||
|
||||
// 외부 UTKTabView의 align-left 등 descendant selector가
|
||||
// 내부 TabView에 침투하는 것을 인라인 스타일로 차단
|
||||
_tabView.schedule.Execute(() =>
|
||||
{
|
||||
var headerContainer = _tabView.Q(className: "unity-tab-view__header-container");
|
||||
if (headerContainer != null)
|
||||
{
|
||||
headerContainer.style.flexDirection = FlexDirection.Row;
|
||||
headerContainer.style.borderRightWidth = 0;
|
||||
headerContainer.style.borderTopWidth = 0;
|
||||
headerContainer.style.borderLeftWidth = 0;
|
||||
}
|
||||
|
||||
// underline도 top-align 방식(하단 가로선)으로 강제
|
||||
_tabView.Query(className: "unity-tab__header-underline").ForEach(underline =>
|
||||
{
|
||||
underline.style.left = 0;
|
||||
underline.style.right = 0;
|
||||
underline.style.bottom = 0;
|
||||
underline.style.top = StyleKeyword.Auto;
|
||||
underline.style.width = StyleKeyword.Auto;
|
||||
underline.style.height = 2;
|
||||
});
|
||||
|
||||
// tab header margin도 top-align 방식으로 강제
|
||||
_tabView.Query(className: "unity-tab__header").ForEach(header =>
|
||||
{
|
||||
header.style.marginRight = new StyleLength(StyleKeyword.Null);
|
||||
header.style.marginBottom = 0;
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
private void SubscribeToThemeChanges()
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
"dependencies": {
|
||||
"com.cysharp.unitask": "https://github.com/Cysharp/UniTask.git?path=src/UniTask/Assets/Plugins/UniTask",
|
||||
"com.github-glitchenzo.nugetforunity": "https://github.com/GlitchEnzo/NuGetForUnity.git?path=/src/NuGetForUnity",
|
||||
"com.ivanmurzak.unity.mcp": "0.49.1",
|
||||
"com.unity.2d.sprite": "1.0.0",
|
||||
"com.unity.ai.navigation": "2.0.9",
|
||||
"com.unity.cloud.gltfast": "6.14.1",
|
||||
@@ -47,8 +48,7 @@
|
||||
"com.unity.modules.video": "1.0.0",
|
||||
"com.unity.modules.vr": "1.0.0",
|
||||
"com.unity.modules.wind": "1.0.0",
|
||||
"com.unity.modules.xr": "1.0.0",
|
||||
"com.ivanmurzak.unity.mcp": "0.48.1"
|
||||
"com.unity.modules.xr": "1.0.0"
|
||||
},
|
||||
"scopedRegistries": [
|
||||
{
|
||||
@@ -64,4 +64,4 @@
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
"hash": "a7c6b49a0141a5bff9b1983e38137522ef61977d"
|
||||
},
|
||||
"com.ivanmurzak.unity.mcp": {
|
||||
"version": "0.48.1",
|
||||
"version": "0.49.1",
|
||||
"depth": 0,
|
||||
"source": "registry",
|
||||
"dependencies": {
|
||||
|
||||
Reference in New Issue
Block a user