Merge pull request #6 from brunomikoski/feature/bug-fixes-and-improve…

…ments

add: updates

CHANGELOG.MD

@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+
+## [0.2.0]
+### Changed
+- Changed initialization of the toolbar to improve performance
+- Updated the toolbar to cache the items only once
+- Toolbar Buttons now should be only visible when history has items
+- Updated the system to sse the SessionState instead of Editor Prefs
+
+### Added
+- Forward button now also has right click support
+
+
+
 ## [0.1.1]
 ### Changed
 - Changed implementation
@@ -25,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added 
  - First initial working version
 
+[0.1.1]: https://github.com/brunomikoski/UnityHistoryPanel/releases/tag/v0.2.0
 [0.1.1]: https://github.com/brunomikoski/UnityHistoryPanel/releases/tag/v0.1.1
 [0.1.0]: https://github.com/brunomikoski/UnityHistoryPanel/releases/tag/v0.1.0
 [0.0.2]: https://github.com/brunomikoski/UnityHistoryPanel/releases/tag/v0.0.2

Scripts/Editor/Core/SelectionData.cs

@@ -16,26 +16,26 @@ internal class SelectionData
         [SerializeField]
         private List<int> instanceIDs = new List<int>();
 
-        private string m_displayName;
+        private string displayName;
         public string DisplayName
         {
 	        get
 	        {
-		        if (string.IsNullOrEmpty(m_displayName)) 
+		        if (string.IsNullOrEmpty(displayName)) 
 		        {
-			        m_displayName = string.Join(", ", GetSelectionObjects().Where(o => o != null).Select(o => o.name));
-			        if (m_displayName.Length > 50)
-				        m_displayName = m_displayName.Substring(0, 47) + "...";
+			        displayName = string.Join(", ", GetSelectionObjects().Where(o => o != null).Select(o => o.name));
+			        if (displayName.Length > 50)
+				        displayName = displayName.Substring(0, 47) + "...";
 		        }
-		        return m_displayName;
+		        return displayName;
 	        }
         }
 
         public bool IsValid => GetSelectionObjects().Any(selectionObj => selectionObj != null);
 
         public SelectionData(Object[] objects)
         {
-            m_displayName = string.Empty;
+            displayName = string.Empty;
             for (int i = 0; i < objects.Length; i++)
             {
                 Object o = objects[i];

Scripts/Editor/Core/SelectionHistoryData.cs

@@ -31,16 +31,20 @@ public void AddToHistory(Object[] objects)
                 return;
             if (pointInTime < selectionData.Count - 1)
                 selectionData.RemoveRange(pointInTime, selectionData.Count - 1 - pointInTime);
+
             selectionData.Add(item);
+
             if (selectionData.Count > SelectionHistoryToolbar.MaximumHistoryItems)
                 selectionData.RemoveAt(0);
+
             pointInTime = selectionData.Count - 1;
         }
 
         public void Back()
         {
             if (pointInTime == 0)
                 return;
+
             for (int i = pointInTime - 1; i >= 0; i--)
             {
                 SelectionData data = selectionData[i];
@@ -59,6 +63,7 @@ public void Forward()
                 return;
             if (pointInTime + 1 > selectionData.Count - 1)
                 return;
+
             pointInTime++;
             movingInHistory = true;
             selectionData[pointInTime].Select();

Scripts/Editor/Core/SelectionHistoryToolbar.cs

@@ -23,7 +23,7 @@ private static SelectionHistoryData History
                     return CACHED_HISTORY;
 
                 CACHED_HISTORY = new SelectionHistoryData();
-                string historyJson = EditorPrefs.GetString(HISTORY_STORAGE_KEY, string.Empty);
+                string historyJson = SessionState.GetString(HISTORY_STORAGE_KEY, string.Empty);
                 if (!string.IsNullOrEmpty(historyJson))
                     EditorJsonUtility.FromJsonOverwrite(historyJson, CACHED_HISTORY);
                 return CACHED_HISTORY;
@@ -32,6 +32,7 @@ private static SelectionHistoryData History
 
 
         private static int? CACHED_MAXIMUM_HISTORY_ITEMS;
+
         public static int MaximumHistoryItems
         {
             get
@@ -43,6 +44,9 @@ public static int MaximumHistoryItems
             }
         }
 
+        private static VisualElement backButton;
+        private static VisualElement forwardButton;
+
 
         static SelectionHistoryToolbar()
         {
@@ -78,8 +82,10 @@ private static void Initialize()
                 a => DropdownMenuAction.Status.None);
 
             parent.Add(HISTORY_SELECTION_MENU);
-            parent.Add(AddButton("d_tab_prev@2x", "Go Back in Selection History", GoBack, ShowHistorySelectionMenu));
-            parent.Add(AddButton("d_tab_next@2x", "Go Forward in Selection History", GoForward));
+            backButton = AddButton("d_tab_prev@2x", "Go Back in Selection History", GoBack, ShowBackwardsHistory);
+            parent.Add(backButton);
+            forwardButton = AddButton("d_tab_next@2x", "Go Forward in Selection History", GoForward, ShowForwardHistory);
+            parent.Add(forwardButton);
 
 
             UnityMainToolbarUtility.AddCustom(UnityMainToolbarUtility.TargetContainer.Left,
@@ -104,12 +110,19 @@ private static void SaveHistory()
                 return;
 
             string json = EditorJsonUtility.ToJson(CACHED_HISTORY);
-            EditorPrefs.SetString(HISTORY_STORAGE_KEY, json);
+            SessionState.SetString(HISTORY_STORAGE_KEY, json);
         }
 
         private static void OnSelectionChanged()
         {
             History.AddToHistory(Selection.objects);
+            UpdateButtonsVisibility();
+        }
+
+        private static void UpdateButtonsVisibility()
+        {
+            backButton.SetEnabled(History.SelectionData.Count > 1 && History.PointInTime > 0);
+            forwardButton.SetEnabled(History.SelectionData.Count > 1 && History.PointInTime < History.SelectionData.Count - 1);
         }
 
         [MenuItem("Tools/Selection History/Go Back")]
@@ -128,38 +141,61 @@ private static void ClearHistory()
         {
             EditorPrefs.DeleteKey(HISTORY_STORAGE_KEY);
             CACHED_HISTORY = new SelectionHistoryData();
+            UpdateButtonsVisibility();
         }
 
         private static void SetPointInTime(int itemIndex)
         {
             History.SetPointInTime(itemIndex);
         }
 
-        private static void ShowHistorySelectionMenu()
+        private static void ShowBackwardsHistory()
         {
             HISTORY_SELECTION_MENU.menu.MenuItems().Clear();
 
-            for (int i = 0; i < History.SelectionData.Count; i++)
+            for (int i = History.PointInTime-1; i >= 0; i--)
             {
                 SelectionData selectionData = History.SelectionData[i];
 
                 if (!selectionData.IsValid)
                     continue;
 
-                bool isOnCurrentItem = i == History.PointInTime;
+                int targetIndex = i;
+                HISTORY_SELECTION_MENU.menu.AppendAction(selectionData.DisplayName, a =>
+                {
+                    SetPointInTime(targetIndex);
+                });
+            }
+
+
+            HISTORY_SELECTION_MENU.menu.AppendSeparator();
+            HISTORY_SELECTION_MENU.menu.AppendAction("Clear History", a =>
+            {
+                ClearHistory();
+            }, a => DropdownMenuAction.Status.Normal);
+
+            HISTORY_SELECTION_MENU.ShowMenu();
+        }
+
+        private static void ShowForwardHistory()
+        {
+            HISTORY_SELECTION_MENU.menu.MenuItems().Clear();
+
+            for (int i = History.PointInTime+1; i < History.SelectionData.Count; i++)
+            {
+                SelectionData selectionData = History.SelectionData[i];
+
+                if (!selectionData.IsValid)
+                    continue;
 
-                DropdownMenuAction.Status status = DropdownMenuAction.Status.Normal;
-                if (isOnCurrentItem)
-                    status = DropdownMenuAction.Status.Checked;
 
                 int targetIndex = i;
                 HISTORY_SELECTION_MENU.menu.AppendAction(selectionData.DisplayName, a =>
                 {
                     SetPointInTime(targetIndex);
-                }, a => status);
+                });
             }
 
-
             HISTORY_SELECTION_MENU.menu.AppendSeparator();
             HISTORY_SELECTION_MENU.menu.AppendAction("Clear History", a =>
             {
@@ -169,6 +205,7 @@ private static void ShowHistorySelectionMenu()
             HISTORY_SELECTION_MENU.ShowMenu();
         }
 
+
         #region UI Elements visuals
 
         private static VisualElement AddButton(string iconName, string tooltip, Action leftMouseClickCallback,