Back button works

icosa-foundation · Mar 20, 2023 · a8614e1 · a8614e1
1 parent 41b39df
commit a8614e1
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 1 deletion.
diff --git a/Assets/Prefabs/Panels/SketchbookPanel.prefab b/Assets/Prefabs/Panels/SketchbookPanel.prefab
@@ -15210,6 +15210,41 @@ PrefabInstance:
       propertyPath: m_DescriptionText
       value: Back
       objectReference: {fileID: 0}
+    - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8,
+        type: 3}
+      propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8,
+        type: 3}
+      propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8,
+        type: 3}
+      propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 2478559423573741591}
+    - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8,
+        type: 3}
+      propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8,
+        type: 3}
+      propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: BackButtonPressed
+      objectReference: {fileID: 0}
+    - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8,
+        type: 3}
+      propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: TiltBrush.SketchbookPanel, Assembly-CSharp
+      objectReference: {fileID: 0}
+    - target: {fileID: 7879899076693153277, guid: 0963942396a615f4fb1b390436e881b8,
+        type: 3}
+      propertyPath: m_Action.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 0963942396a615f4fb1b390436e881b8, type: 3}
 --- !u!4 &5835854812254485208 stripped

diff --git a/Assets/Scripts/GUI/LoadSketchButton.cs b/Assets/Scripts/GUI/LoadSketchButton.cs
@@ -163,6 +163,7 @@ override protected void OnButtonPressed()
                 {
                     var sketchSet = new ResourceCollectionSketchSet(collection);
                     SketchbookPanel.Instance.PushSketchSet(SketchbookPanel.Instance.SelectedSketchStack, sketchSet);
+                    return;
                 }
             }
 

diff --git a/Assets/Scripts/GUI/SketchbookPanel.cs b/Assets/Scripts/GUI/SketchbookPanel.cs
@@ -265,6 +265,15 @@ public void PushSketchSet(int stack, ISketchSet sketchSet)
             }
         }
 
+        public void PopSketchSet(int stack)
+        {
+            m_SetStacks[stack].Pop();
+            if (stack == m_SelectedStack)
+            {
+                SetVisibleSketchSet((RootSet)m_SelectedStack);
+            }
+        }
+
         void SetVisibleSketchSet(RootSet stack)
         {
             int stackIndex = (int)stack;
@@ -824,6 +833,11 @@ public void ButtonPressed(GalleryButton.Type rType, BaseButton button = null)
             }
         }
 
+        public void BackButtonPressed()
+        {
+            PopSketchSet(m_SelectedStack);
+        }
+
         private void OnSketchSetDirty()
         {
             ComputeNumPages();

diff --git a/Assets/Scripts/ResourceSystem/ResourceCollectionSketchSet.cs b/Assets/Scripts/ResourceSystem/ResourceCollectionSketchSet.cs
@@ -148,7 +148,7 @@ public bool GetSketchIcon(int index, out Texture2D icon, out string[] authors, o
             var sketch = m_Sketches[index];
             icon = sketch.Icon;
             authors = sketch.Authors;
-            description = "DESCRIPTION NOT IMPLEMENTED";
+            description = sketch.ResourceFileInfo.Resource.Description ?? "";
             return icon != null;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -163,6 +163,7 @@ override protected void OnButtonPressed() @@
                     {
                         var sketchSet = new ResourceCollectionSketchSet(collection);
                         SketchbookPanel.Instance.PushSketchSet(SketchbookPanel.Instance.SelectedSketchStack, sketchSet);
+                        return;
                     }
                 }
@@ Expand Down @@