Fix bugs.

ichenpipi · Aug 10, 2023 · 7d2478b · 7d2478b
1 parent d578981
commit 7d2478b
Show file tree

Hide file tree

Showing 8 changed files with 75 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [1.0.3] - 2023-08-10
+
+- Fix bugs.
+
 ## [1.0.2] - 2023-08-08
 
 - Fix styling issues with Light theme.

diff --git a/Editor/Scripts/Window/Content/ProjectPinBoardWindowAssetList.cs b/Editor/Scripts/Window/Content/ProjectPinBoardWindowAssetList.cs
@@ -46,7 +46,7 @@ private void InitListView()
                 style =
                 {
                     flexBasis = Length.Percent(100),
-                    minWidth = 150,
+                    minWidth = 100,
                 }
             };
             m_ContentSplitView.Add(m_AssetList);

diff --git a/Editor/Scripts/Window/Content/ProjectPinBoardWindowPreview.cs b/Editor/Scripts/Window/Content/ProjectPinBoardWindowPreview.cs
@@ -91,7 +91,7 @@ private void InitContentPreview()
                 style =
                 {
                     flexBasis = Length.Percent(100),
-                    minWidth = 150,
+                    minWidth = 100,
                 }
             };
             m_ContentSplitView.Add(m_PreviewPane);

diff --git a/Editor/Scripts/Window/ProjectPinBoardWindow.cs b/Editor/Scripts/Window/ProjectPinBoardWindow.cs
@@ -66,7 +66,7 @@ public static ProjectPinBoardWindow CreateInstance()
                 text = k_Title,
                 image = PipiUtility.GetIcon("Favorite"),
             };
-            window.minSize = new Vector2(250f, 200f);
+            window.minSize = new Vector2(100, 100);
             window.SetSize(600, 500);
             window.SetCenter();
             return window;
@@ -251,7 +251,33 @@ private void ApplySettings()
             m_ToolbarTopFolderToggle.SetValueWithoutNotify(ProjectPinBoardSettings.topFolder);
             m_ToolbarPreviewToggle.SetValueWithoutNotify(ProjectPinBoardSettings.enablePreview);
             m_ToolbarSyncSelectionToggle.SetValueWithoutNotify(ProjectPinBoardSettings.syncSelection);
-            m_ContentSplitView.fixedPaneInitialDimension = ProjectPinBoardSettings.dragLinePos;
+
+            ApplySettings_DragLine();
+        }
+
+        /// <summary>
+        /// 应用拖拽线
+        /// </summary>
+        private void ApplySettings_DragLine()
+        {
+            if (!IsContentInited()) return;
+
+            float rootWidth = rootVisualElement.worldBound.width;
+            float leftPaneMinWidth = m_AssetList.style.minWidth.value.value;
+            float rightPaneMinWidth = m_PreviewPane.style.minWidth.value.value;
+            float dragLinePos = ProjectPinBoardSettings.dragLinePos;
+            if (dragLinePos < leftPaneMinWidth || dragLinePos > rootWidth - rightPaneMinWidth)
+            {
+                dragLinePos = leftPaneMinWidth;
+            }
+            else
+            {
+                if (m_ContentSplitView.fixedPaneIndex == 1)
+                {
+                    dragLinePos = rootWidth - dragLinePos;
+                }
+            }
+            m_ContentSplitView.fixedPaneInitialDimension = dragLinePos;
         }
 
         #endregion

diff --git a/Editor/Scripts/Window/ProjectPinBoardWindowContent.cs b/Editor/Scripts/Window/ProjectPinBoardWindowContent.cs
@@ -30,6 +30,11 @@ public partial class ProjectPinBoardWindow
         /// </summary>
         private TwoPaneSplitView m_ContentSplitView = null;
 
+        /// <summary>
+        /// 内容分栏拖拽线
+        /// </summary>
+        private VisualElement m_ContentDragLine = null;
+
         /// <summary>
         /// 初始化内容
         /// </summary>
@@ -95,13 +100,26 @@ void Callback(GeometryChangedEvent evt)
 
             // 拖拽线
             {
-                VisualElement dragLine = m_ContentSplitView.Q<VisualElement>("unity-dragline-anchor");
-                IStyle dragLineStyle = dragLine.style;
+                m_ContentDragLine = m_ContentSplitView.Q<VisualElement>("unity-dragline-anchor");
+                IStyle dragLineStyle = m_ContentDragLine.style;
                 // 禁止拖拽线在Hover的时候变颜色
                 Color color = dragLineColor;
-                dragLine.RegisterCallback<MouseEnterEvent>((evt) => dragLineStyle.backgroundColor = color);
+                m_ContentDragLine.RegisterCallback<MouseEnterEvent>((evt) => dragLineStyle.backgroundColor = color);
                 // 拖动拖拽线后保存其位置
-                dragLine.RegisterCallback<MouseUpEvent>((evt) => ProjectPinBoardSettings.dragLinePos = dragLineStyle.left.value.value);
+                m_ContentDragLine.RegisterCallback<MouseUpEvent>((evt) =>
+                {
+                    float rootWidth = rootVisualElement.worldBound.width;
+                    float leftPaneMinWidth = m_AssetList.style.minWidth.value.value;
+                    float rightPaneMinWidth = m_PreviewPane.style.minWidth.value.value;
+                    float dragLinePos = dragLineStyle.left.value.value;
+                    if (dragLinePos < leftPaneMinWidth || dragLinePos > rootWidth - rightPaneMinWidth)
+                    {
+                        dragLinePos = leftPaneMinWidth;
+                        dragLineStyle.left = dragLinePos;
+                        m_ContentSplitView.fixedPaneInitialDimension = dragLinePos;
+                    }
+                    ProjectPinBoardSettings.dragLinePos = dragLinePos;
+                });
             }
 
             // 初始化列表

diff --git a/Editor/Scripts/Window/ProjectPinBoardWindowMenu.cs b/Editor/Scripts/Window/ProjectPinBoardWindowMenu.cs
@@ -19,8 +19,9 @@ public void AddItemsToMenu(GenericMenu menu)
             menu.AddItem(new GUIContent("Clear Data ⚠️"), false, Menu_ClearData);
             menu.AddItem(new GUIContent("Reset Settings ⚠️"), false, Menu_ResetSettings);
             menu.AddSeparator(string.Empty);
-            menu.AddItem(new GUIContent("About/Home Page (Gitee)"), false, Menu_HomePage1);
-            menu.AddItem(new GUIContent("About/Home Page (Github)"), false, Menu_HomePage2);
+            menu.AddItem(new GUIContent("About/陈皮皮 (ichenpipi)"), false, Menu_HomePage);
+            menu.AddItem(new GUIContent("About/Project Home Page (Github)"), false, Menu_ProjectHomePageGithub);
+            menu.AddItem(new GUIContent("About/Project Home Page (Gitee)"), false, Menu_ProjectHomePageGitee);
         }
 
         private void Menu_Reload()
@@ -57,16 +58,21 @@ private void Menu_ResetSettings()
             ApplySettings();
         }
 
-        private void Menu_HomePage1()
+        private void Menu_HomePage()
         {
-            Application.OpenURL("https://gitee.com/ichenpipi/unity-project-pin-board");
+            Application.OpenURL("https://github.com/ichenpipi");
         }
 
-        private void Menu_HomePage2()
+        private void Menu_ProjectHomePageGithub()
         {
             Application.OpenURL("https://github.com/ichenpipi/unity-project-pin-board");
         }
 
+        private void Menu_ProjectHomePageGitee()
+        {
+            Application.OpenURL("https://gitee.com/ichenpipi/unity-project-pin-board");
+        }
+
     }
 
 }
diff --git a/Editor/Scripts/Window/Toolbar/ProjectPinBoardWindowToolbarPreview.cs b/Editor/Scripts/Window/Toolbar/ProjectPinBoardWindowToolbarPreview.cs
@@ -69,6 +69,11 @@ private void OnPreviewToggleValueChanged(ChangeEvent<bool> evt)
         {
             ProjectPinBoardSettings.enablePreview = evt.newValue;
             TogglePreview(evt.newValue);
+            // 确保拖拽线位置无异常
+            if (evt.newValue)
+            {
+                ApplySettings_DragLine();
+            }
         }
 
     }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "com.chenpipi.project-pin-board",
-    "version": "1.0.2",
+    "version": "1.0.3",
     "unity": "2020.2",
     "displayName": "Project Pin Board",
     "keywords": [
@@ -13,13 +13,13 @@
     "author": {
         "name": "ChenPipi",
         "email": "[email protected]",
-        "url": "https://gitee.com/ichenpipi"
+        "url": "https://github.com/ichenpipi"
     },
     "dependencies": {
     },
     "repository": {
         "type": "git",
-        "url": "https://gitee.com/ichenpipi/unity-project-pin-board.git"
+        "url": "https://github.com/ichenpipi/unity-project-pin-board.git"
     },
     "license": "MIT"
 }