From dc1c028d5a98b63101f3d840f78cca50e0e111f0 Mon Sep 17 00:00:00 2001
From: JacobTech <jacob@jacobtech.com>
Date: Thu, 11 Apr 2024 20:22:40 -0400
Subject: [PATCH] Fixed Messages Not Showing

---
 Luski/GUI/MainScreen/UI/PublicServers/Channel.cs    | 4 +++-
 Luski/GUI/MainScreen/UI/PublicServers/PublicChat.cs | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Luski/GUI/MainScreen/UI/PublicServers/Channel.cs b/Luski/GUI/MainScreen/UI/PublicServers/Channel.cs
index e8528a2..9388fb7 100644
--- a/Luski/GUI/MainScreen/UI/PublicServers/Channel.cs
+++ b/Luski/GUI/MainScreen/UI/PublicServers/Channel.cs
@@ -115,7 +115,9 @@ public class Channel : UserControl
                 Console.WriteLine("Waiting");
                 Task.WaitAll(mm);
                 Globals.ms.pc.MessageFlow.ForceScrollUpdate();
-                Globals.ms.pc.MessageFlow.ScrollToBottom();
+                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();
+                else Globals.ms.pc.MessageFlow.ScrollToTop();
                 Console.WriteLine("Done");
             }
             BlockDraw = false;
diff --git a/Luski/GUI/MainScreen/UI/PublicServers/PublicChat.cs b/Luski/GUI/MainScreen/UI/PublicServers/PublicChat.cs
index 3b2b64f..14d1da8 100644
--- a/Luski/GUI/MainScreen/UI/PublicServers/PublicChat.cs
+++ b/Luski/GUI/MainScreen/UI/PublicServers/PublicChat.cs
@@ -402,6 +402,7 @@ public class PublicChat : UserControl
     public void ClearChat()
     {
         MessageFlow.Controls.Clear();
+        MessageFlow.ScrollValue = 0;
         MessageFlow.ScrollUpdatesInterval = 33;
         lastm = null;
         lastUser = null;