JacobTech.com/Luski
3
2
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

Merge dev into main #18

Merged
JacobTech merged 5 commits from dev into main 2024-04-11 20:36:04 -04:00
Conversation 0 Commits 5 Files Changed 8 +8 -6
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3c0a1cfe62 - Show all commits

1
Luski/GUI/MainScreen/UI/AccountButton.cs
View File

@ -82,6 +82,7 @@ public class AccountButton : UserControl
SM.Selected = this;
SM.page.Controls.Clear();
OnPageLoad.Invoke();
Globals.ms.ForceUpdate(new(Globals.ms.CS));
}
BlockDraw = false;

11
Luski/GUI/MainScreen/UI/AddServerOverlay.cs
View File

@ -27,10 +27,8 @@ public class AddServerOverlay : UserControl, IServerOverlay
public AddServerOverlay()
{
base.Size = Globals.ms.ClientSize;
BackgroundColor = new(0, 0, 0, 130);
base.BackgroundColor = new(0, 0, 0, 130);
Anchor = ObjectAnchor.All;
Form = new(Globals.ms.TextureManager.GetTextureResource("RoundedRectangle.png"))
{
@ -337,7 +335,6 @@ public class AddServerOverlay : UserControl, IServerOverlay
DisplayName.Textures[0] = UserName.Textures[0];
rec.ForceDistanceUpdate(page);
Globals.ms.TryDraw();
Globals.ms.ForceUpdate(new(Size));
}
};
ca.Size = new((Form.Size.X - tb.Location.X - tb.Location.X - (tb.Location.X / 2)) / 2, ca.Size.Y);
@ -396,6 +393,7 @@ public class AddServerOverlay : UserControl, IServerOverlay
return Task.CompletedTask;
};
UserName.Size = UserName.Size;
page.Controls.Add(Password = new()
{
@ -443,8 +441,12 @@ public class AddServerOverlay : UserControl, IServerOverlay
return Task.CompletedTask;
};
Password.Size = Password.Size;
Password.ForceDistanceUpdate(page);
DisplayName = null!;
rec = null!;
Globals.ms.ForceUpdate(new(Globals.ms.CS));
TryDraw();
}
};
lo.Size = ca.Size;
@ -554,7 +556,6 @@ public class AddServerOverlay : UserControl, IServerOverlay
Globals.ms.ser.Controls.Insert(Globals.ms.ser.Controls.Length - 1, ss);
await ss.LoadServer();
Globals.ms.Controls.Remove(this);
Globals.ms.ForceUpdate(new(Size));
Globals.ms.TryDraw();
}

2
Luski/GUI/MainScreenWindow.cs
View File

@ -396,7 +396,7 @@ public class MainScreenWindow : Window
Controls.Add(aso);
TryDraw();
OnResize(new(Size));
OnResize(new(CS));
return Task.CompletedTask;
}