quartznet/pulsar
2
0
Fork 0
mirror of https://github.com/9ParsonsB/Pulsar.git synced 2025-04-05 17:39:39 -04:00
Code Actions

Fix file browse dialogs causing UI thread blocking in linux.

Browse Source
This commit is contained in:
Xjph 2021-06-06 18:29:30 -02:30
parent bbfcc98b97
commit a331157e3a
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ObservatoryCore/UI/Views/BasicUIView.axaml.cs
View File

@ -148,13 +148,18 @@ namespace Observatory.UI.Views
Directory = journalPath.Text Directory = journalPath.Text
}; };
var browseTask = openFolderDialog.ShowAsync((Window)((Button)source).GetVisualRoot()); var browseTask = openFolderDialog.ShowAsync((Window)((Button)source).GetVisualRoot());
string path = browseTask.Result; browseTask.ContinueWith((task) =>
if (path != string.Empty)
{ {
journalPath.Text = path; string path = task.Result;
Properties.Core.Default.JournalFolder = path; if (path != string.Empty)
Properties.Core.Default.Save(); {
} Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() => { journalPath.Text = path; });
Properties.Core.Default.JournalFolder = path;
Properties.Core.Default.Save();
}
});
}; };
corePanel.AddControl(journalPathLabel, 1, 0); corePanel.AddControl(journalPathLabel, 1, 0);
@ -215,8 +220,6 @@ namespace Observatory.UI.Views
private void GeneratePluginSettingUI(Grid gridPanel, IObservatoryPlugin plugin) private void GeneratePluginSettingUI(Grid gridPanel, IObservatoryPlugin plugin)
{ {
//var plugin = pluginSettings.Key;
var displayedSettings = PluginManagement.PluginManager.GetSettingDisplayNames(plugin.Settings); var displayedSettings = PluginManagement.PluginManager.GetSettingDisplayNames(plugin.Settings);
if (displayedSettings.Count > 0) if (displayedSettings.Count > 0)
@ -268,7 +271,6 @@ namespace Observatory.UI.Views
PluginManagement.PluginManager.GetInstance.SaveSettings(plugin, plugin.Settings); PluginManagement.PluginManager.GetInstance.SaveSettings(plugin, plugin.Settings);
}; };
//settingsGrid.Children.Add(checkBox);
settingsGrid.AddControl(checkBox, settingsGrid.RowDefinitions.Count - 1, settingsGrid.Children.Count % 2 == 0 ? 0 : 1); settingsGrid.AddControl(checkBox, settingsGrid.RowDefinitions.Count - 1, settingsGrid.Children.Count % 2 == 0 ? 0 : 1);
break; break;
@ -309,16 +311,18 @@ namespace Observatory.UI.Views
AllowMultiple = false AllowMultiple = false
}; };
var browseTask = openFileDialog.ShowAsync((Window)((Button)source).GetVisualRoot()); var browseTask = openFileDialog.ShowAsync((Window)((Button)source).GetVisualRoot());
browseTask.ContinueWith((task) =>
if (browseTask.Result.Count() > 0)
{ {
string path = browseTask.Result[0]; if (task.Result.Count() > 0)
settingPath.Text = path; {
string path = browseTask.Result[0];
Avalonia.Threading.Dispatcher.UIThread.InvokeAsync(() => { settingPath.Text = path; });
setting.Key.SetValue(plugin.Settings, new System.IO.FileInfo(path));
PluginManagement.PluginManager.GetInstance.SaveSettings(plugin, plugin.Settings);
setting.Key.SetValue(plugin.Settings, new System.IO.FileInfo(path)); }
PluginManagement.PluginManager.GetInstance.SaveSettings(plugin, plugin.Settings); });
}
}; };
StackPanel stackPanel = new() { Orientation = Avalonia.Layout.Orientation.Horizontal }; StackPanel stackPanel = new() { Orientation = Avalonia.Layout.Orientation.Horizontal };
@ -326,13 +330,12 @@ namespace Observatory.UI.Views
stackPanel.Children.Add(settingPath); stackPanel.Children.Add(settingPath);
settingsGrid.RowDefinitions.Add(new RowDefinition() { Height = new GridLength(21) }); settingsGrid.RowDefinitions.Add(new RowDefinition() { Height = new GridLength(21) });
//settingsGrid.AddControl(label, settingsGrid.RowDefinitions.Count - 1, 0, 2);
settingsGrid.AddControl(stackPanel, settingsGrid.RowDefinitions.Count - 1, 0, 2); settingsGrid.AddControl(stackPanel, settingsGrid.RowDefinitions.Count - 1, 0, 2);
settingsGrid.AddControl(settingBrowse, settingsGrid.RowDefinitions.Count - 1, 2); settingsGrid.AddControl(settingBrowse, settingsGrid.RowDefinitions.Count - 1, 2);
break; break;
} }
//wrapPanel.Children.Add(panel);
} }
} }
} }