diff --git a/Example/SaveSystem/Script/ViewSaveSystem.cs b/Example/SaveSystem/Script/ViewSaveSystem.cs index fd2b32c..714ef34 100644 --- a/Example/SaveSystem/Script/ViewSaveSystem.cs +++ b/Example/SaveSystem/Script/ViewSaveSystem.cs @@ -46,14 +46,18 @@ namespace EGFramework.Examples.Test { } - public struct DataStudent { + public struct DataStudent + { public string Name { get; set; } public int Age; public int ID; - public DataStudent(string name, int age) { + public EGPathSelect Path { set; get; } + public DataStudent(string name, int age) + { Name = name; Age = age; ID = 0; + Path = new EGPathSelect(); } } diff --git a/addons/EGFramework/Module/GenerateTools/Templete/Godot/Dialog/EGodotBasicDialog.cs b/addons/EGFramework/Module/GenerateTools/Templete/Godot/Dialog/EGodotBasicDialog.cs index 14bc30f..9be5002 100644 --- a/addons/EGFramework/Module/GenerateTools/Templete/Godot/Dialog/EGodotBasicDialog.cs +++ b/addons/EGFramework/Module/GenerateTools/Templete/Godot/Dialog/EGodotBasicDialog.cs @@ -26,6 +26,7 @@ namespace EGFramework.UI EGodotFileDialog fileDialog = self.SingletoneNode("FileDialog"); fileDialog.Title = title; fileDialog.RootSubfolder = filePath; + fileDialog.PopupCentered(); fileDialog.InitFileSelect(selectPath); } @@ -34,6 +35,7 @@ namespace EGFramework.UI EGodotFileDialog fileDialog = self.SingletoneNode("FileDialog"); fileDialog.Title = title; fileDialog.RootSubfolder = filePath; + fileDialog.PopupCentered(); fileDialog.InitSaveFileSelect(selectPath); } @@ -42,6 +44,7 @@ namespace EGFramework.UI EGodotFileDialog fileDialog = self.SingletoneNode("FileDialog"); fileDialog.Title = title; fileDialog.RootSubfolder = filePath; + fileDialog.PopupCentered(); fileDialog.InitDirSelect(selectPath); } } diff --git a/addons/EGFramework/Module/GenerateTools/Templete/Godot/Dialog/EGodotFileDialog.cs b/addons/EGFramework/Module/GenerateTools/Templete/Godot/Dialog/EGodotFileDialog.cs index 79d6309..a5986b3 100644 --- a/addons/EGFramework/Module/GenerateTools/Templete/Godot/Dialog/EGodotFileDialog.cs +++ b/addons/EGFramework/Module/GenerateTools/Templete/Godot/Dialog/EGodotFileDialog.cs @@ -27,7 +27,6 @@ namespace EGFramework.UI OnFileSelect.Register(callback); Init(); this.FileMode = FileModeEnum.OpenFile; - this.PopupCentered(); } public void InitDirSelect(Action callback) @@ -35,7 +34,6 @@ namespace EGFramework.UI OnDirSelect.Register(callback); this.FileMode = FileModeEnum.OpenDir; Init(); - this.PopupCentered(); } public void InitFilesSelect(Action callback) @@ -43,7 +41,6 @@ namespace EGFramework.UI OnFilesSelect.Register(callback); this.FileMode = FileModeEnum.OpenFiles; Init(); - this.PopupCentered(); } public void InitAnySelect(Action singleSelectCallback, Action multiSelectCallback) @@ -53,7 +50,6 @@ namespace EGFramework.UI OnFilesSelect.Register(multiSelectCallback); this.FileMode = FileModeEnum.OpenAny; Init(); - this.PopupCentered(); } public void InitSaveFileSelect(Action callback) @@ -61,7 +57,6 @@ namespace EGFramework.UI OnFileSelect.Register(callback); this.FileMode = FileModeEnum.SaveFile; Init(); - this.PopupCentered(); } diff --git a/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotEditParam.cs b/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotEditParam.cs index 7ef97ce..7c953a0 100644 --- a/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotEditParam.cs +++ b/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotEditParam.cs @@ -122,8 +122,12 @@ namespace EGFramework.UI ParamReadOnly.Text = pathSelect.Path; this.AddChild(ParamReadOnly); this.ParamOperate = new Button(); - ParamOperate.Name = "Select file"; + ParamOperate.Name = "SelectBtn"; + ParamOperate.Text = "Select file"; ParamOperate.SizeFlagsHorizontal = SizeFlags.ExpandFill; + ParamOperate.Pressed += () => { + this.EGFileOpen("res://", str => { ParamReadOnly.Text = str; }); + }; // ParamOperate.Pressed += this.AddChild(ParamOperate); } diff --git a/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotTable.cs b/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotTable.cs index 2d702c2..3300c1f 100644 --- a/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotTable.cs +++ b/addons/EGFramework/Module/GenerateTools/Templete/Godot/UI/EGodotTable.cs @@ -29,9 +29,9 @@ namespace EGFramework.UI protected List> TableData { set; get; } - protected Dictionary EmptyData { set; get; } - - protected Dictionary TitleData { set; get; } + protected Dictionary EmptyData { set; get; } + + protected Dictionary TitleData { set; get; } = new Dictionary(); protected EasyEvent> AddData { set; get; } = new EasyEvent>(); diff --git a/addons/EGFramework/Module/GenerateTools/Templete/Variant/EGDataStruct.cs b/addons/EGFramework/Module/GenerateTools/Templete/Variant/EGDataStruct.cs index 5554950..eade494 100644 --- a/addons/EGFramework/Module/GenerateTools/Templete/Variant/EGDataStruct.cs +++ b/addons/EGFramework/Module/GenerateTools/Templete/Variant/EGDataStruct.cs @@ -32,6 +32,10 @@ namespace EGFramework { public string Path { set; get; } public bool IsDir { set; get; } + public override string ToString() + { + return Path; + } } public interface IEGReadOnlyString