fix: picker filter reset

JeremyMeissner · JeremyMeissner · commit b37ec4ffd95d · 2022-06-08T11:18:48.000+02:00
diff --git a/FreeFrame/Components/Shapes/SVGPolygon.cs b/FreeFrame/Components/Shapes/SVGPolygon.cs
@@ -24,13 +24,13 @@ public SVGPolygon(XmlReader reader)
             IsResizeable = false;
             IsCornerRadiusChangeable = false;
 
-            string points = reader["points"] ?? throw new Exception("points not here"); // TODO: Error handler if points is note here
+            string points = reader["points"] ?? throw new Exception("points not here");
             MatchCollection matches = _pointsAttributeRegex.Matches(points); // Retrieve every points
 
             foreach (Match match in matches)
                 Points.Add((Convert.ToInt32(match.Groups[1].Value), Convert.ToInt32(match.Groups[2].Value)));
 
-            string color = reader["fill"] ?? DefaultColor; // TODO: Error handler if d is note here
+            string color = reader["fill"] ?? DefaultColor;
             Color = Importer.HexadecimalToRGB(color);
 
             // Fill geometry values
@@ -72,7 +72,7 @@ public SVGPolygon(int x, int y, int width, int height, string color)
         public override float[] GetVertices()
         {
             if (Points.Count == 3) // Because a triangle is also base on the size
-                return new float[] { X + Width / 2, Y, X, Y + Height, X + Width, Y + Height }; // TODO: Use Select, Cast, whatever                                                                   
+                return new float[] { X + Width / 2, Y, X, Y + Height, X + Width, Y + Height };                                                               
             else // Any other polygon
             {
                 List<float> vertices = new List<float>();
diff --git a/FreeFrame/Components/Shapes/SVGRectangle.cs b/FreeFrame/Components/Shapes/SVGRectangle.cs
@@ -25,7 +25,7 @@ public SVGRectangle(XmlReader reader) : this(
             Convert.ToInt32(reader["y"]),
             Convert.ToInt32(reader["rx"]),
             Convert.ToInt32(reader["ry"]),
-            Convert.ToString(reader["fill"] == null ? DefaultColor : reader["fill"])) // TODO: Error handler if one of the properties in reader is note here, it should be dynamic
+            Convert.ToString(reader["fill"] == null ? DefaultColor : reader["fill"]))
         {
         }
         public SVGRectangle() : this(DefaultWidth, DefaultHeight, DefaultX, DefaultY) { }
diff --git a/FreeFrame/Components/Shapes/Shape.cs b/FreeFrame/Components/Shapes/Shape.cs
@@ -9,11 +9,6 @@ namespace FreeFrame.Components.Shapes
 {
     public abstract class Shape : IDrawable
     {
-        bool _isMoveable = true;
-        bool _isResizeable = true;
-        bool _isAngleChangeable = true;
-        bool _isCornerRadiusChangeable = true;
-
         #region Default values
         public const string DefaultColor = "#000000FF";
         #endregion
@@ -22,6 +17,10 @@ public abstract class Shape : IDrawable
         private int _x, _y, _width, _height, _angle, _cornerRadius;
         private Color4 _color;
         Guid _id;
+        bool _isMoveable = true;
+        bool _isResizeable = true;
+        bool _isAngleChangeable = true;
+        bool _isCornerRadiusChangeable = true;
         #endregion
 
         private List<Renderer> renderers;
@@ -46,7 +45,6 @@ public string ShortId
         {
             get => Id.ToString().Substring(0, 6);
         }
-
         public Shape()
         {
             Renderers = new List<Renderer>();
diff --git a/FreeFrame/Helper.cs b/FreeFrame/Helper.cs
@@ -57,6 +57,5 @@ static public void EnableDebugMode()
             GL.Enable(EnableCap.DebugOutput);
             GL.Enable(EnableCap.DebugOutputSynchronous);
         }
-
     }
 }
diff --git a/FreeFrame/Lib/ImGuiFile/FilePicker.cs b/FreeFrame/Lib/ImGuiFile/FilePicker.cs
@@ -12,7 +12,7 @@ namespace FreeFrame.Lib.FileExplorer
 {
     public class FilePicker
     {
-        static readonly Dictionary<object, FilePicker> _filePickers = new Dictionary<object, FilePicker>();
+        static Dictionary<object, FilePicker> _filePickers = new Dictionary<object, FilePicker>();
 
         public string RootFolder;
         public string CurrentFolder;
@@ -52,13 +52,13 @@ public static FilePicker GetFilePicker(object o, string startingPath, string sea
 
                 fp.AllowedExtensions.AddRange(searchFilter.Split(new char[] { '|' }, StringSplitOptions.RemoveEmptyEntries));
 
-
                 _filePickers.Add(o, fp);
             }
-
             return fp;
         }
 
+        public static void Clear() => _filePickers.Clear();
+
         public bool Draw()
         {
             if (CurrentFolder.Length >= 50)
@@ -101,7 +101,6 @@ public bool Draw()
                                     result = true;
                                     ImGui.CloseCurrentPopup();
                                 }
-
                             }
                         }
                     }
@@ -114,6 +113,7 @@ public bool Draw()
             {
                 result = false;
                 ImGui.CloseCurrentPopup();
+                Clear();
             }
 
             if (OnlyAllowFolders)
@@ -166,6 +166,5 @@ List<string> GetFileSystemEntries(string fullName)
 
             return ret;
         }
-
     }
 }
diff --git a/FreeFrame/Lib/ImGuiFile/FileSaver.cs b/FreeFrame/Lib/ImGuiFile/FileSaver.cs
@@ -46,7 +46,7 @@ public static FileSaver GetFilePicker(object o, string startingPath)
 
             return fp;
         }
-        public static void Remove(object o) => _fileSavers.Remove(o);
+        public static void Clear() => _fileSavers.Clear();
 
         public bool Draw()
         {
@@ -86,6 +86,7 @@ public bool Draw()
             {
                 result = false;
                 ImGui.CloseCurrentPopup();
+                Clear();
             }
             ImGui.SameLine();
             if (ImGui.Button("Save here"))
diff --git a/FreeFrame/Window.cs b/FreeFrame/Window.cs
@@ -270,7 +270,7 @@ protected override void OnUnload()
 
             Shapes.ForEach(shape => shape.DeleteObjects());
         }
-        
+
         private void OnLeftMouseDown()
         {
             if (_userMode != UserMode.Create) // If it's not to create
@@ -929,9 +929,9 @@ private void ShowUI()
                     if (ImGui.Button(String.Format("Remove keyframe {0} for {1}", _timeline.TimelineIndex, _selectedShape.GetType().Name)))
                     {
                         _timeline.SortedTimeline[_timeline.TimelineIndex].Remove(_timeline.SortedTimeline[_timeline.TimelineIndex].Find(x => x.Id == _selectedShape.Id)!); // Can't be null
+                        // If timeline empty then null it
                         if (_timeline.SortedTimeline[_timeline.TimelineIndex].Count == 0)
                             _timeline.SortedTimeline.Remove(_timeline.TimelineIndex);
-                        // If list _timeline[_ioTimeline] empty then null it
                     }
                 }
                 else
@@ -992,31 +992,26 @@ private void ShowUI()
                         {
                             _dialogFileSaver = true;
                             _exportMode = ExportMode.Workspace;
-                            //SaveFreeFrameWorkspace();
                         }
                         if (ImGui.MenuItem("Save as SVG"))
                         {
                             _dialogFileSaver = true;
                             _exportMode = ExportMode.SVG;
-                            //SaveCurrentScreenToSVG();
                         }
                         if (ImGui.MenuItem("Save as MP4"))
                         {
                             _dialogFileSaver = true;
                             _exportMode = ExportMode.MP4;
-                            //SaveCurrentScreenToMP4();
                         }
                         if (ImGui.MenuItem("Save as GIF"))
                         {
                             _dialogFileSaver = true;
                             _exportMode = ExportMode.GIF;
-                            //SaveCurrentScreenToGIF();
                         }
                         if (ImGui.MenuItem("Save as PNG"))
                         {
                             _dialogFileSaver = true;
                             _exportMode = ExportMode.PNG;
-                            //SaveCurrentScreenToPNG();
                         }
                         ImGui.EndMenu();
                     }
@@ -1059,7 +1054,7 @@ private void ShowUI()
             // File picker dialog
             if (_dialogFileSaver)
                 ImGui.OpenPopup("save-file");
-            if (ImGui.BeginPopupModal("save-file")) // ImGuiWindowFlags.AlwaysAutoResize
+            if (ImGui.BeginPopupModal("save-file"))
             {
                 var picker = FileSaver.GetFilePicker(this, Path.Combine(Environment.CurrentDirectory, "Content/Atlases"));
                 if (picker.Draw())
@@ -1085,16 +1080,16 @@ private void ShowUI()
                         default:
                             break;
                     }
+                    FileSaver.Clear();
                 }
-                //FileSaver.Remove(this);
                 _dialogFileSaver = false;
                 ImGui.EndPopup();
             }
 
             // File picker dialog
             if (_dialogFilePicker)
                 ImGui.OpenPopup("open-file");
-            if (ImGui.BeginPopupModal("open-file")) // ImGuiWindowFlags.AlwaysAutoResize
+            if (ImGui.BeginPopupModal("open-file"))
             {
                 var picker = FilePicker.GetFilePicker(this, Path.Combine(Environment.CurrentDirectory, "Content/Atlases"), _importMode == ImportMode.Workspace ? ".freeframe" : ".svg");
                 if (picker.Draw())
@@ -1130,15 +1125,16 @@ private void ShowUI()
                     //if (compatibilityFlag)
                     //    _dialogCompatibility = true;
 
+                    FilePicker.Clear();
                 }
-                //FilePicker.Remove(this);
                 _dialogFilePicker = false;
                 ImGui.EndPopup();
             }
 
             // Compatibility alert
             if (_dialogCompatibility)
                 ImGui.OpenPopup("Compatibility Problem");
+
             if (ImGui.BeginPopupModal("Compatibility Problem")) // ImGuiWindowFlags.AlwaysAutoResize
             {
                 ImGui.Text("Some SVG elements are not compatible. Go to the list of compatible SVG elements");
@@ -1310,7 +1306,6 @@ public void SaveCurrentScreenToPNG(string path)
             TakeSnap().Save(path + ".png", ImageFormat.Png);
         }
 
-
         /// <summary>
         /// Render the timeline
         /// </summary>
@@ -1340,7 +1335,7 @@ public Bitmap TakeSnap()
 
             // Lock the bits
             BitmapData bmpData = bmp.LockBits(new System.Drawing.Rectangle(0, 0, ClientSize.X, ClientSize.Y), ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format24bppRgb);
-            
+
             // Fill with current window
             GL.ReadPixels(0, 0, ClientSize.X, ClientSize.Y, OpenTK.Graphics.OpenGL4.PixelFormat.Bgr, PixelType.UnsignedByte, bmpData.Scan0);
 

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public SVGRectangle(XmlReader reader) : this(`
`25`	`25`	`Convert.ToInt32(reader["y"]),`
`26`	`26`	`Convert.ToInt32(reader["rx"]),`
`27`	`27`	`Convert.ToInt32(reader["ry"]),`
`28`		`- Convert.ToString(reader["fill"] == null ? DefaultColor : reader["fill"])) // TODO: Error handler if one of the properties in reader is note here, it should be dynamic`
	`28`	`+ Convert.ToString(reader["fill"] == null ? DefaultColor : reader["fill"]))`
`29`	`29`	`{`
`30`	`30`	`}`
`31`	`31`	`public SVGRectangle() : this(DefaultWidth, DefaultHeight, DefaultX, DefaultY) { }`
Original file line number	Diff line number	Diff line change
`@@ -9,11 +9,6 @@ namespace FreeFrame.Components.Shapes`
`9`	`9`	`{`
`10`	`10`	`public abstract class Shape : IDrawable`
`11`	`11`	`{`
`12`		`- bool _isMoveable = true;`
`13`		`- bool _isResizeable = true;`
`14`		`- bool _isAngleChangeable = true;`
`15`		`- bool _isCornerRadiusChangeable = true;`
`16`		`-`
`17`	`12`	`#region Default values`
`18`	`13`	`public const string DefaultColor = "#000000FF";`
`19`	`14`	`#endregion`
`@@ -22,6 +17,10 @@ public abstract class Shape : IDrawable`
`22`	`17`	`private int _x, _y, _width, _height, _angle, _cornerRadius;`
`23`	`18`	`private Color4 _color;`
`24`	`19`	`Guid _id;`
	`20`	`+ bool _isMoveable = true;`
	`21`	`+ bool _isResizeable = true;`
	`22`	`+ bool _isAngleChangeable = true;`
	`23`	`+ bool _isCornerRadiusChangeable = true;`
`25`	`24`	`#endregion`
`26`	`25`
`27`	`26`	`private List<Renderer> renderers;`
`@@ -46,7 +45,6 @@ public string ShortId`
`46`	`45`	`{`
`47`	`46`	`get => Id.ToString().Substring(0, 6);`
`48`	`47`	`}`
`49`		`-`
`50`	`48`	`public Shape()`
`51`	`49`	`{`
`52`	`50`	`Renderers = new List<Renderer>();`
Original file line number	Diff line number	Diff line change
`@@ -57,6 +57,5 @@ static public void EnableDebugMode()`
`57`	`57`	`GL.Enable(EnableCap.DebugOutput);`
`58`	`58`	`GL.Enable(EnableCap.DebugOutputSynchronous);`
`59`	`59`	`}`
`60`		`-`
`61`	`60`	`}`
`62`	`61`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ namespace FreeFrame.Lib.FileExplorer`
`12`	`12`	`{`
`13`	`13`	`public class FilePicker`
`14`	`14`	`{`
`15`		`- static readonly Dictionary<object, FilePicker> _filePickers = new Dictionary<object, FilePicker>();`
	`15`	`+ static Dictionary<object, FilePicker> _filePickers = new Dictionary<object, FilePicker>();`
`16`	`16`
`17`	`17`	`public string RootFolder;`
`18`	`18`	`public string CurrentFolder;`
`@@ -52,13 +52,13 @@ public static FilePicker GetFilePicker(object o, string startingPath, string sea`
`52`	`52`
`53`	`53`	`fp.AllowedExtensions.AddRange(searchFilter.Split(new char[] { '\|' }, StringSplitOptions.RemoveEmptyEntries));`
`54`	`54`
`55`		`-`
`56`	`55`	`_filePickers.Add(o, fp);`
`57`	`56`	`}`
`58`		`-`
`59`	`57`	`return fp;`
`60`	`58`	`}`
`61`	`59`
	`60`	`+ public static void Clear() => _filePickers.Clear();`
	`61`	`+`
`62`	`62`	`public bool Draw()`
`63`	`63`	`{`
`64`	`64`	`if (CurrentFolder.Length >= 50)`
`@@ -101,7 +101,6 @@ public bool Draw()`
`101`	`101`	`result = true;`
`102`	`102`	`ImGui.CloseCurrentPopup();`
`103`	`103`	`}`
`104`		`-`
`105`	`104`	`}`
`106`	`105`	`}`
`107`	`106`	`}`
`@@ -114,6 +113,7 @@ public bool Draw()`
`114`	`113`	`{`
`115`	`114`	`result = false;`
`116`	`115`	`ImGui.CloseCurrentPopup();`
	`116`	`+ Clear();`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`if (OnlyAllowFolders)`
`@@ -166,6 +166,5 @@ List<string> GetFileSystemEntries(string fullName)`
`166`	`166`
`167`	`167`	`return ret;`
`168`	`168`	`}`
`169`		`-`
`170`	`169`	`}`
`171`	`170`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public static FileSaver GetFilePicker(object o, string startingPath)`
`46`	`46`
`47`	`47`	`return fp;`
`48`	`48`	`}`
`49`		`- public static void Remove(object o) => _fileSavers.Remove(o);`
	`49`	`+ public static void Clear() => _fileSavers.Clear();`
`50`	`50`
`51`	`51`	`public bool Draw()`
`52`	`52`	`{`
`@@ -86,6 +86,7 @@ public bool Draw()`
`86`	`86`	`{`
`87`	`87`	`result = false;`
`88`	`88`	`ImGui.CloseCurrentPopup();`
	`89`	`+ Clear();`
`89`	`90`	`}`
`90`	`91`	`ImGui.SameLine();`
`91`	`92`	`if (ImGui.Button("Save here"))`
Original file line number	Diff line number	Diff line change
`@@ -270,7 +270,7 @@ protected override void OnUnload()`
`270`	`270`
`271`	`271`	`Shapes.ForEach(shape => shape.DeleteObjects());`
`272`	`272`	`}`
`273`		`-`
	`273`	`+`
`274`	`274`	`private void OnLeftMouseDown()`
`275`	`275`	`{`
`276`	`276`	`if (_userMode != UserMode.Create) // If it's not to create`
`@@ -929,9 +929,9 @@ private void ShowUI()`
`929`	`929`	`if (ImGui.Button(String.Format("Remove keyframe {0} for {1}", _timeline.TimelineIndex, _selectedShape.GetType().Name)))`
`930`	`930`	`{`
`931`	`931`	`_timeline.SortedTimeline[_timeline.TimelineIndex].Remove(_timeline.SortedTimeline[_timeline.TimelineIndex].Find(x => x.Id == _selectedShape.Id)!); // Can't be null`
	`932`	`+ // If timeline empty then null it`
`932`	`933`	`if (_timeline.SortedTimeline[_timeline.TimelineIndex].Count == 0)`
`933`	`934`	`_timeline.SortedTimeline.Remove(_timeline.TimelineIndex);`
`934`		`- // If list _timeline[_ioTimeline] empty then null it`
`935`	`935`	`}`
`936`	`936`	`}`
`937`	`937`	`else`
`@@ -992,31 +992,26 @@ private void ShowUI()`
`992`	`992`	`{`
`993`	`993`	`_dialogFileSaver = true;`
`994`	`994`	`_exportMode = ExportMode.Workspace;`
`995`		`- //SaveFreeFrameWorkspace();`
`996`	`995`	`}`
`997`	`996`	`if (ImGui.MenuItem("Save as SVG"))`
`998`	`997`	`{`
`999`	`998`	`_dialogFileSaver = true;`
`1000`	`999`	`_exportMode = ExportMode.SVG;`
`1001`		`- //SaveCurrentScreenToSVG();`
`1002`	`1000`	`}`
`1003`	`1001`	`if (ImGui.MenuItem("Save as MP4"))`
`1004`	`1002`	`{`
`1005`	`1003`	`_dialogFileSaver = true;`
`1006`	`1004`	`_exportMode = ExportMode.MP4;`
`1007`		`- //SaveCurrentScreenToMP4();`
`1008`	`1005`	`}`
`1009`	`1006`	`if (ImGui.MenuItem("Save as GIF"))`
`1010`	`1007`	`{`
`1011`	`1008`	`_dialogFileSaver = true;`
`1012`	`1009`	`_exportMode = ExportMode.GIF;`
`1013`		`- //SaveCurrentScreenToGIF();`
`1014`	`1010`	`}`
`1015`	`1011`	`if (ImGui.MenuItem("Save as PNG"))`
`1016`	`1012`	`{`
`1017`	`1013`	`_dialogFileSaver = true;`
`1018`	`1014`	`_exportMode = ExportMode.PNG;`
`1019`		`- //SaveCurrentScreenToPNG();`
`1020`	`1015`	`}`
`1021`	`1016`	`ImGui.EndMenu();`
`1022`	`1017`	`}`
`@@ -1059,7 +1054,7 @@ private void ShowUI()`
`1059`	`1054`	`// File picker dialog`
`1060`	`1055`	`if (_dialogFileSaver)`
`1061`	`1056`	`ImGui.OpenPopup("save-file");`
`1062`		`- if (ImGui.BeginPopupModal("save-file")) // ImGuiWindowFlags.AlwaysAutoResize`
	`1057`	`+ if (ImGui.BeginPopupModal("save-file"))`
`1063`	`1058`	`{`
`1064`	`1059`	`var picker = FileSaver.GetFilePicker(this, Path.Combine(Environment.CurrentDirectory, "Content/Atlases"));`
`1065`	`1060`	`if (picker.Draw())`
`@@ -1085,16 +1080,16 @@ private void ShowUI()`
`1085`	`1080`	`default:`
`1086`	`1081`	`break;`
`1087`	`1082`	`}`
	`1083`	`+ FileSaver.Clear();`
`1088`	`1084`	`}`
`1089`		`- //FileSaver.Remove(this);`
`1090`	`1085`	`_dialogFileSaver = false;`
`1091`	`1086`	`ImGui.EndPopup();`
`1092`	`1087`	`}`
`1093`	`1088`
`1094`	`1089`	`// File picker dialog`
`1095`	`1090`	`if (_dialogFilePicker)`
`1096`	`1091`	`ImGui.OpenPopup("open-file");`
`1097`		`- if (ImGui.BeginPopupModal("open-file")) // ImGuiWindowFlags.AlwaysAutoResize`
	`1092`	`+ if (ImGui.BeginPopupModal("open-file"))`
`1098`	`1093`	`{`
`1099`	`1094`	`var picker = FilePicker.GetFilePicker(this, Path.Combine(Environment.CurrentDirectory, "Content/Atlases"), _importMode == ImportMode.Workspace ? ".freeframe" : ".svg");`
`1100`	`1095`	`if (picker.Draw())`
`@@ -1130,15 +1125,16 @@ private void ShowUI()`
`1130`	`1125`	`//if (compatibilityFlag)`
`1131`	`1126`	`// _dialogCompatibility = true;`
`1132`	`1127`
	`1128`	`+ FilePicker.Clear();`
`1133`	`1129`	`}`
`1134`		`- //FilePicker.Remove(this);`
`1135`	`1130`	`_dialogFilePicker = false;`
`1136`	`1131`	`ImGui.EndPopup();`
`1137`	`1132`	`}`
`1138`	`1133`
`1139`	`1134`	`// Compatibility alert`
`1140`	`1135`	`if (_dialogCompatibility)`
`1141`	`1136`	`ImGui.OpenPopup("Compatibility Problem");`
	`1137`	`+`
`1142`	`1138`	`if (ImGui.BeginPopupModal("Compatibility Problem")) // ImGuiWindowFlags.AlwaysAutoResize`
`1143`	`1139`	`{`
`1144`	`1140`	`ImGui.Text("Some SVG elements are not compatible. Go to the list of compatible SVG elements");`
`@@ -1310,7 +1306,6 @@ public void SaveCurrentScreenToPNG(string path)`
`1310`	`1306`	`TakeSnap().Save(path + ".png", ImageFormat.Png);`
`1311`	`1307`	`}`
`1312`	`1308`
`1313`		`-`
`1314`	`1309`	`/// <summary>`
`1315`	`1310`	`/// Render the timeline`
`1316`	`1311`	`/// </summary>`
`@@ -1340,7 +1335,7 @@ public Bitmap TakeSnap()`
`1340`	`1335`
`1341`	`1336`	`// Lock the bits`
`1342`	`1337`	`BitmapData bmpData = bmp.LockBits(new System.Drawing.Rectangle(0, 0, ClientSize.X, ClientSize.Y), ImageLockMode.WriteOnly, System.Drawing.Imaging.PixelFormat.Format24bppRgb);`
`1343`		`-`
	`1338`	`+`
`1344`	`1339`	`// Fill with current window`
`1345`	`1340`	`GL.ReadPixels(0, 0, ClientSize.X, ClientSize.Y, OpenTK.Graphics.OpenGL4.PixelFormat.Bgr, PixelType.UnsignedByte, bmpData.Scan0);`
`1346`	`1341`