From 570fa572d3c29e0e9bc0e13f09079b12227c22ac Mon Sep 17 00:00:00 2001 From: JacobTech Date: Mon, 18 Nov 2024 10:31:57 -0500 Subject: [PATCH] Fixed Most Rendering Most controls would render in the wrong location due to the OpenGL cords not being updated. --- Luski/GUI/MainScreen/UI/Generic/MessageFlow.cs | 2 +- .../MainScreen/UI/SettingsPanel/ExperimentGUI.cs | 13 ++----------- Luski/GUI/MainScreenWindow.cs | 2 -- Luski/Luski.csproj | 2 +- 4 files changed, 4 insertions(+), 15 deletions(-) diff --git a/Luski/GUI/MainScreen/UI/Generic/MessageFlow.cs b/Luski/GUI/MainScreen/UI/Generic/MessageFlow.cs index 643cb08..1bc8897 100644 --- a/Luski/GUI/MainScreen/UI/Generic/MessageFlow.cs +++ b/Luski/GUI/MainScreen/UI/Generic/MessageFlow.cs @@ -4,7 +4,7 @@ using OpenTK.Graphics.OpenGL4; namespace Luski.GUI.MainScreen.UI.Generic; -public class MessageFlow : FlowLayout +public class MessageFlow : LuskiFlow { public override void ResizeDraw(int x, int y, int sx, int sy, int sw, int sh) { diff --git a/Luski/GUI/MainScreen/UI/SettingsPanel/ExperimentGUI.cs b/Luski/GUI/MainScreen/UI/SettingsPanel/ExperimentGUI.cs index 5d8ea28..8223616 100644 --- a/Luski/GUI/MainScreen/UI/SettingsPanel/ExperimentGUI.cs +++ b/Luski/GUI/MainScreen/UI/SettingsPanel/ExperimentGUI.cs @@ -13,7 +13,6 @@ public class ExperimentGUI : UserControl public DropDown dd; private static Texture? TopOpen, BottomOpen; private ExperimentSelectorInfo? currentEnabled; - private Label n; private static ExperimentSelectorInfo DisabledESI = new() { @@ -41,7 +40,7 @@ public class ExperimentGUI : UserControl Location = new(5.ScaleInt()), Text = ei.DisplayName }; - n = new(Globals.MessageFont) + Label n = new(Globals.MessageFont) { Text = ei.Name, Location = new(Top.Location.X, Top.Location.Y + Top.Size.Y + Top.Location.Y), @@ -84,7 +83,7 @@ public class ExperimentGUI : UserControl dd.OpenStatusChanged += b => { BlockDraw = true; - Size = new(base.Size.X, base.Size.Y + ( b ? dd.DropDownContainer.Size.Y : -1 * dd.DropDownContainer.Size.Y)); + SetSize(base.Size.X, base.Size.Y + ( b ? dd.DropDownContainer.Size.Y : -1 * dd.DropDownContainer.Size.Y)); if (b) { dd.Textures[0] = TopOpen; @@ -129,7 +128,6 @@ public class ExperimentGUI : UserControl base.Size = new(Globals.ms.ClientSize.X - 307.ScaleInt() - 80.ScaleInt(), 15.ScaleInt() + dd.Size.Y + dd.Location.Y ); dd.Size = new(base.Size.X - Top.Location.X - Top.Location.X, dd.Size.Y); dd.ForceDistanceUpdate(this); - Controls.Add(Top); } @@ -147,11 +145,4 @@ public class ExperimentGUI : UserControl } return Task.CompletedTask; } - - public override void ParentResize() - { - base.ParentResize(); - dd.Location = new(Top.Location.X, n.Location.Y + n.Size.Y + Top.Location.Y); - dd.ForceDistanceUpdate(this); - } } \ No newline at end of file diff --git a/Luski/GUI/MainScreenWindow.cs b/Luski/GUI/MainScreenWindow.cs index 5feb5f0..b9b6fd9 100644 --- a/Luski/GUI/MainScreenWindow.cs +++ b/Luski/GUI/MainScreenWindow.cs @@ -190,10 +190,8 @@ public class MainScreenWindow : Window private async Task OnWindowLoaded(Window arg) { BlockDraw = false; - Console.WriteLine("start"); string irl = $"https://www.jacobtech.com/Updater/GetProgramVersion?directory=Luski&branch=main&selfcontained={Globals.UpdaterSettings.SelfContained.ToString().ToLower()}&platform={Globals.UpdaterSettings.Platform}"; - Console.WriteLine(irl); if (Globals.UpdaterSettings.AutoUpdateCheck && new HttpClient() .GetAsync( irl) diff --git a/Luski/Luski.csproj b/Luski/Luski.csproj index 9ad337a..4d8e3b8 100644 --- a/Luski/Luski.csproj +++ b/Luski/Luski.csproj @@ -22,7 +22,7 @@ - +