Multiple journal support

jsebold666 · Feb 1, 2024 · c877e3c · c877e3c
1 parent ffb8d25
commit c877e3c
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 31 deletions.
diff --git a/src/ClassicUO.Client/Configuration/Profile.cs b/src/ClassicUO.Client/Configuration/Profile.cs
@@ -820,10 +820,9 @@ public List<Gump> ReadGumps(string path)
                                     break;
 
                                 case GumpType.Journal:
-                                    //gump = new JournalGump();
                                     gump = new ResizableJournal();
-                                    x = ProfileManager.CurrentProfile.JournalPosition.X;
-                                    y = ProfileManager.CurrentProfile.JournalPosition.Y;
+                                    //x = ProfileManager.CurrentProfile.JournalPosition.X;
+                                    //y = ProfileManager.CurrentProfile.JournalPosition.Y;
                                     break;
 
                                 case GumpType.MacroButton:

diff --git a/src/ClassicUO.Client/Game/GameActions.cs b/src/ClassicUO.Client/Game/GameActions.cs
@@ -30,7 +30,6 @@
 
 #endregion
 
-using System;
 using ClassicUO.Configuration;
 using ClassicUO.Game.Data;
 using ClassicUO.Game.GameObjects;
@@ -42,6 +41,7 @@
 using ClassicUO.Resources;
 using ClassicUO.Utility;
 using Microsoft.Xna.Framework;
+using System;
 using static ClassicUO.Network.NetClient;
 
 namespace ClassicUO.Game
@@ -147,30 +147,7 @@ public static void OpenStatusBar()
 
         public static void OpenJournal()
         {
-            ResizableJournal resizableJournal = UIManager.GetGump<ResizableJournal>();
-            if (resizableJournal == null)
-                UIManager.Add(new ResizableJournal());
-            else
-            {
-                resizableJournal.SetInScreen();
-                resizableJournal.BringOnTop();
-            }
-            //JournalGump journalGump = UIManager.GetGump<JournalGump>();
-
-            //if (journalGump == null)
-            //{
-            //    UIManager.Add(new JournalGump { X = 64, Y = 64 });
-            //}
-            //else
-            //{
-            //    journalGump.SetInScreen();
-            //    journalGump.BringOnTop();
-
-            //    if (journalGump.IsMinimized)
-            //    {
-            //        journalGump.IsMinimized = false;
-            //    }
-            //}
+            UIManager.Add(new ResizableJournal());
         }
 
         public static void OpenSkills()
@@ -207,7 +184,7 @@ public static void OpenMiniMap()
         public static void BandageSelf()
         {
             Item bandage = World.Player.FindBandage();
-            if(bandage != null)
+            if (bandage != null)
             {
                 NetClient.Socket.Send_TargetSelectedObject(bandage.Serial, World.Player.Serial);
             }

diff --git a/src/ClassicUO.Client/Game/UI/Gumps/ResizableJournal.cs b/src/ClassicUO.Client/Game/UI/Gumps/ResizableJournal.cs
@@ -6,10 +6,11 @@
 using ClassicUO.Input;
 using ClassicUO.Renderer;
 using ClassicUO.Utility.Collections;
-using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Xml;
+using Point = Microsoft.Xna.Framework.Point;
 
 namespace ClassicUO.Game.UI.Gumps
 {
@@ -19,7 +20,7 @@ internal class ResizableJournal : ResizableGump
         public static bool ReloadTabs { get; set; } = false;
 
         private static int BORDER_WIDTH = 4;
-        private static int MIN_WIDTH = (BORDER_WIDTH * 2) + (TAB_WIDTH * 4);
+        private static int MIN_WIDTH = (BORDER_WIDTH * 2) + (TAB_WIDTH * 4) + 20;
         private const int MIN_HEIGHT = 100;
         private const int SCROLL_BAR_WIDTH = 14;
         #region TABS
@@ -316,6 +317,46 @@ public static void UpdateJournalOptions()
             }
         }
 
+        public override void Save(XmlTextWriter writer)
+        {
+            base.Save(writer);
+            writer.WriteAttributeString("rw", Width.ToString());
+            writer.WriteAttributeString("rh", Height.ToString());
+
+            int c = 0;
+            foreach (var tab in _tab)
+            {
+                if (tab.IsSelected)
+                {
+                    writer.WriteAttributeString("tab", c.ToString());
+                    break;
+                }
+                c++;
+            }
+        }
+
+        public override void Restore(XmlElement xml)
+        {
+            base.Restore(xml);
+
+            Point savedSize = new Microsoft.Xna.Framework.Point(Width, Height);
+
+            if (int.TryParse(xml.GetAttribute("rw"), out int width) && width > 0)
+            {
+                savedSize.X = width;
+            }
+            if (int.TryParse(xml.GetAttribute("rh"), out int height) && height > 0)
+            {
+                savedSize.Y = height;
+            }
+            if (int.TryParse(xml.GetAttribute("tab"), out int tab))
+            {
+                OnButtonClick(tab); //Simulate selecting a tab
+            }
+
+            ResizeWindow(savedSize);
+        }
+
         protected override void OnMouseWheel(MouseEventType delta)
         {
             base.OnMouseWheel(delta);
@@ -385,6 +426,8 @@ public override void Update()
         {
             base.Update();
 
+            if (IsDisposed) { return; }
+
             if (X != _lastX || Y != _lastY)
             {
                 _lastX = X;