fixed HTML parsing after uxml update

shnok · Dec 2, 2024 · 9dec795 · 9dec795
1 parent abc8c53
commit 9dec795
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 61 deletions.
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/NpcHtmlWindow/HtmlRow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/NpcHtmlWindow/HtmlRow.uxml
@@ -1,4 +1,4 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xmlns="UnityEngine.UIElements" editor-extension-mode="False">
     <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
-    <ui:VisualElement name="HtmlRow" class="html-row" style="flex-grow: 0; min-height: auto; width: 100%;" />
+    <ui:VisualElement name="HtmlRow" class="html-row" />
 </ui:UXML>
diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/NpcHtmlWindow/HtmlStyle.uss b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/NpcHtmlWindow/HtmlStyle.uss
@@ -12,6 +12,22 @@
     --unity-cursor-color: rgba(0, 0, 0, 0);
 }
 
+.npc-html-window .l2-flex-button {
+    margin-top: 0;
+    margin-left: 0;
+    margin-right: 0;
+    margin-bottom: 0;
+    font-size: 11;
+}
+
+.npc-html-window .l2-input-field {
+    margin-top: 2;
+    margin-left: 5;
+    margin-right: 5;
+    margin-bottom: 0;
+    font-size: 11;
+}
+
 .html-window-content {
     height: 367px;
     position: absolute;
@@ -49,6 +65,7 @@
 .npc-html-window .l2-scroll-view .unity-scroll-view__vertical-scroller {
     margin-bottom: 2px;
     margin-top: 1px;
+    margin-left: 0px;
     margin-right: 0;
 }
 
@@ -96,26 +113,28 @@
 }
 
 .html-table {
-    margin-top: 0;
+    margin-top: 2;
     margin-right: 0;
-    margin-bottom: 0;
+    margin-bottom: 2;
     margin-left: 0;
     padding-top: 0;
     padding-right: 0;
-    padding-bottom: 0;
+    padding-bottom: 2;
     padding-left: 0;
     align-self: flex-start;
 }
 
 .html-row {
     flex-grow: 1;
     min-height: 18px;
+    width: auto;
     flex-direction: row;
 }
 
 .html-cell {
-    flex-grow: 0;
+    flex-grow: 1;
     flex-shrink: 0;
+    justify-content: center;
 }
 
 .html-wrapper {

diff --git a/l2-unity/Assets/Resources/Data/UI/_Elements/Game/NpcHtmlWindow/NpcHtmlWindow.uxml b/l2-unity/Assets/Resources/Data/UI/_Elements/Game/NpcHtmlWindow/NpcHtmlWindow.uxml
@@ -1,8 +1,8 @@
 <ui:UXML xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" xmlns="UnityEngine.UIElements" editor-extension-mode="False">
     <ui:Template name="WindowTemplate" src="project://database/Assets/Resources/Data/UI/_Elements/Components/WindowTemplate.uxml?fileID=9197481963319205126&amp;guid=5ca840f56ef6f1044b4dc077c7d3e6e6&amp;type=3#WindowTemplate" />
     <Style src="project://database/Assets/Resources/Data/UI/_Elements/L2StyleSheet.uss?fileID=7433441132597879392&amp;guid=72e99cc94b130bf4ba100dceaa830b13&amp;type=3#L2StyleSheet" />
-    <ui:Instance template="WindowTemplate" name="WindowTemplate" class="npc-html-window" style="width: 318px; height: 428px;">
-        <ui:VisualElement name="Content" class="html-window-content-container" style="width: 304px; left: 6px; height: 380px;">
+    <ui:Instance template="WindowTemplate" name="WindowTemplate" class="npc-html-window" style="width: 336px; height: 428px;">
+        <ui:VisualElement name="Content" class="html-window-content-container" style="width: 324px; left: 6px; height: 380px;">
             <ui:ScrollView name="HtmlContent" horizontal-scroller-visibility="Hidden" vertical-scroller-visibility="AlwaysVisible" class="l2-scroll-view html-window-content" style="flex-grow: 1;">
                 <ui:VisualElement name="ContentWrapper" class="html-window-content-wrapper" style="display: flex;" />
             </ui:ScrollView>