From a6fc28e2ab1902677d95c08a8b8948f714a9a778 Mon Sep 17 00:00:00 2001 From: JacobTech Date: Fri, 25 Aug 2023 12:13:06 -0400 Subject: [PATCH] Alternate servers. Now, using the new alternate servers. --- Luski/GUI/MainScreen.cs | 24 +++++++++---------- .../UI/PublicServers/ChatMessage.cs | 6 +++-- Luski/Luski.csproj | 2 +- Luski/Program.cs | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Luski/GUI/MainScreen.cs b/Luski/GUI/MainScreen.cs index 33dec9e..3dbe711 100644 --- a/Luski/GUI/MainScreen.cs +++ b/Luski/GUI/MainScreen.cs @@ -273,7 +273,7 @@ public class MainScreen : Window Location = new(ser.Size.X, 0), Size = new(Size.X - ser.Size.X, Size.Y), Anchor = ObjectAnchor.All, - BackgroundColor = Color4.DarkRed + BackgroundColor = new(20,20,20,255) }; Controls.Add(SerBox); SerBox.LoadToParent(this, this); @@ -283,9 +283,12 @@ public class MainScreen : Window #endregion #region Channel Selector Init - SocketChannel currentchannel = await Server.User.GetSelectedChannel(CancellationToken.None); + SocketChannel current_channel = await Server.User.GetSelectedChannel(CancellationToken.None); + Channel.SelectedTextures[0] = Globals.ms.TextureManager.AddTexture(Tools.GetResourceStream(Assembly.GetExecutingAssembly(), "Luski.Resources.Textures.al.png")); + Channel.SelectedTextures[1] = Globals.ms.TextureManager.AddTexture(Tools.GetResourceStream(Assembly.GetExecutingAssembly(), "Luski.Resources.Textures.ac.png")); + Channel.SelectedTextures[2] = Globals.ms.TextureManager.AddTexture(Tools.GetResourceStream(Assembly.GetExecutingAssembly(), "Luski.Resources.Textures.ar.png")); List parents = new(); - SocketCategory? cur = await currentchannel.GetParent(); + SocketCategory? cur = await current_channel.GetParent(); while (cur is not null) { parents.Add(cur); @@ -296,16 +299,13 @@ public class MainScreen : Window ChannelSelector cs = new(parents[0]) { BackgroundColor = new(34, 34, 34, 255), - Size = new((int)(307 * Globals.Settings.Scale), SerBox.Size.Y - 150), + Size = new((int)(307 * Globals.Settings.Scale), SerBox.Size.Y - 106), Anchor = ObjectAnchor.Top | ObjectAnchor.Left | ObjectAnchor.Bottom }; parents.RemoveAt(0); SerBox.Controls.Add(cs); - cs.LoadToParent(SerBox, this); - cs.ForceDistanceUpdate(); - Channel.SelectedTextures[0] = Globals.ms.TextureManager.AddTexture(Tools.GetResourceStream(Assembly.GetExecutingAssembly(), "Luski.Resources.Textures.al.png")); - Channel.SelectedTextures[1] = Globals.ms.TextureManager.AddTexture(Tools.GetResourceStream(Assembly.GetExecutingAssembly(), "Luski.Resources.Textures.ac.png")); - Channel.SelectedTextures[2] = Globals.ms.TextureManager.AddTexture(Tools.GetResourceStream(Assembly.GetExecutingAssembly(), "Luski.Resources.Textures.ar.png")); + cs.ForceDistanceUpdate(SerBox); + #endregion #region Chat Init @@ -322,7 +322,7 @@ public class MainScreen : Window #endregion #region Channel Selector Loader - _ = cs.Load(currentchannel, parents); + _ = cs.Load(current_channel, parents); #endregion #region User Icon @@ -396,9 +396,7 @@ public class MainScreen : Window Texture uut = TextureManager.AddTexture(Globals.Luski.MainServer.User.GetAvatar(CancellationToken.None).Result); uut.Unit = TextureUnit.Texture1; - // u.Shader = Rectangle.DefaultAlphaTextureShader[Context]; - //u.Textures.Add(uut); - //Controls.Add(u); + Label ul = new Label(Globals.DefaultFont) { Anchor = ObjectAnchor.Bottom | ObjectAnchor.Left, diff --git a/Luski/GUI/MainScreen/UI/PublicServers/ChatMessage.cs b/Luski/GUI/MainScreen/UI/PublicServers/ChatMessage.cs index 310f6e8..5cdea74 100644 --- a/Luski/GUI/MainScreen/UI/PublicServers/ChatMessage.cs +++ b/Luski/GUI/MainScreen/UI/PublicServers/ChatMessage.cs @@ -8,9 +8,9 @@ using GraphicsManager.Objects.Core; using Luski.net.Interfaces; using Luski.net.Structures.Main; using Luski.net.Structures.Public; -using OpenTK.Graphics.OpenGL4; using OpenTK.Mathematics; using OpenTK.Windowing.Common.Input; +using Label = GraphicsManager.Objects.Label; namespace Luski.GUI.MainScreen.UI.PublicServers; @@ -178,8 +178,10 @@ public class ChatMessage : UserControl if (OperatingSystem.IsWindows()) Process.Start(m.Text); else if (OperatingSystem.IsLinux()) - if (m.Tag is string s) Process.Start("xdg-open",s); + { + if (m.Tag is string s) Process.Start("xdg-open", s); else Process.Start("xdg-open", m.Text); + } } catch (Exception e) { diff --git a/Luski/Luski.csproj b/Luski/Luski.csproj index c830fd6..5cfb53c 100644 --- a/Luski/Luski.csproj +++ b/Luski/Luski.csproj @@ -20,7 +20,7 @@ - + diff --git a/Luski/Program.cs b/Luski/Program.cs index 253dc2e..76f0365 100644 --- a/Luski/Program.cs +++ b/Luski/Program.cs @@ -50,7 +50,7 @@ try Globals.ms = new MainScreen(); Globals.ms.CustomF11 = false; Globals.ms.DrawFrame(); - Globals.ms.Cursor = new MouseCursor(0, 0, Logo.Width, Logo.Height, pixels); + //Globals.ms.Cursor = new MouseCursor(0, 0, Logo.Width, Logo.Height, pixels); pixels = Array.Empty(); Globals.ms.StartRender(); Globals.ms.Dispose();