From 248f603309ebe10ed583da347daae6805a007d81 Mon Sep 17 00:00:00 2001 From: drojf <1249449+drojf@users.noreply.github.com> Date: Mon, 5 Feb 2024 21:52:45 +1100 Subject: [PATCH] Fix textwindow margins not being applied via mod functions --- Assets.Scripts.Core.Buriko/BurikoScriptFile.cs | 4 +--- Assets.Scripts.UI/MainUIController.cs | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Assets.Scripts.Core.Buriko/BurikoScriptFile.cs b/Assets.Scripts.Core.Buriko/BurikoScriptFile.cs index 77119bc9..6b1d5312 100644 --- a/Assets.Scripts.Core.Buriko/BurikoScriptFile.cs +++ b/Assets.Scripts.Core.Buriko/BurikoScriptFile.cs @@ -2515,9 +2515,7 @@ private BurikoVariable OperationSetWindowMargins() int num2 = ReadVariable().IntValue(); int num3 = ReadVariable().IntValue(); int num4 = ReadVariable().IntValue(); - gameSystem.TextController.WindowMargins = new Vector4(num, num2, num3, num4); - gameSystem.TextController.WindowMarginsJp = new Vector4(num, num2, num3, num4); - gameSystem.TextController.RefreshMargins(); + gameSystem.MainUIController.SetWindowMargins(num, num2, num3, num4); return BurikoVariable.Null; } diff --git a/Assets.Scripts.UI/MainUIController.cs b/Assets.Scripts.UI/MainUIController.cs index 66636243..8a9d0c12 100644 --- a/Assets.Scripts.UI/MainUIController.cs +++ b/Assets.Scripts.UI/MainUIController.cs @@ -302,7 +302,10 @@ public void SetWindowSize(int x, int y) public void SetWindowMargins(int left, int top, int right, int bottom) { - TextWindow.margin = new Vector4(left, top, right, bottom); + Vector4 newMargin = new Vector4(left, top, right, bottom); + gameSystem.TextController.WindowMargins = newMargin; + gameSystem.TextController.WindowMarginsJp = newMargin; + gameSystem.TextController.RefreshMargins(); } public TMP_FontAsset GetEnglishFont()