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 +4 -1
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dc1c028d5a - Show all commits

2
Luski/GUI/MainScreen/UI/PublicServers/Channel.cs
View File

@ -115,7 +115,9 @@ public class Channel : UserControl
Console.WriteLine("Waiting"); Console.WriteLine("Waiting");
Task.WaitAll(mm); Task.WaitAll(mm);
Globals.ms.pc.MessageFlow.ForceScrollUpdate(); Globals.ms.pc.MessageFlow.ForceScrollUpdate();
if (Globals.ms.pc.MessageFlow.Controls.Length > 1 && Globals.ms.pc.MessageFlow.Controls[Globals.ms.pc.MessageFlow.Controls.Length - 1].Location.Y + Globals.ms.pc.MessageFlow.Controls[Globals.ms.pc.MessageFlow.Controls.Length - 1].Size.Y > Globals.ms.pc.MessageFlow.Size.Y)
Globals.ms.pc.MessageFlow.ScrollToBottom(); Globals.ms.pc.MessageFlow.ScrollToBottom();
else Globals.ms.pc.MessageFlow.ScrollToTop();
Console.WriteLine("Done"); Console.WriteLine("Done");
} }
BlockDraw = false; BlockDraw = false;

1
Luski/GUI/MainScreen/UI/PublicServers/PublicChat.cs
View File

@ -402,6 +402,7 @@ public class PublicChat : UserControl
public void ClearChat() public void ClearChat()
{ {
MessageFlow.Controls.Clear(); MessageFlow.Controls.Clear();
MessageFlow.ScrollValue = 0;
MessageFlow.ScrollUpdatesInterval = 33; MessageFlow.ScrollUpdatesInterval = 33;
lastm = null; lastm = null;
lastUser = null; lastUser = null;