DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 11:56:30 +00:00
Code Issues Releases Wiki Activity

Device visualizer - Added support for rotation and scale

Browse Source 
Profile editor - Fixed keyframe context menu actions
This commit is contained in:
SpoinkyNL committed 2020-06-22 17:43:04 +02:00
1 parent 6504c621c6
commit 35944e064d
15 files changed
+185 -78
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI.Shared/Services/Dialog/DialogService.cs
+17 -10
View File
@@ -96,18 +96,25 @@ namespace Artemis.UI.Shared.Services.Dialog
new ConstructorArgument("exception", exception)
};
await Execute.OnUIThreadAsync(async () =>
try
{
try
await Execute.OnUIThreadAsync(async () =>
{
DialogHost.CloseDialogCommand.Execute(new object(), null);
await ShowDialog<ExceptionDialogViewModel>(arguments);
}
catch (Exception)
{
// ignored
}
});
try
{
DialogHost.CloseDialogCommand.Execute(new object(), null);
await ShowDialog<ExceptionDialogViewModel>(arguments);
}
catch (Exception)
{
// ignored
}
});
}
catch (Exception)
{
// ignored
}
}
private async Task<object> ShowDialog(string identifier, DialogViewModelBase viewModel)
src/Artemis.UI.Shared/Services/Dialog/DialogViewModelBase.cs
+14 -2
View File
@@ -5,6 +5,9 @@ namespace Artemis.UI.Shared.Services.Dialog
{
public abstract class DialogViewModelBase : ValidatingModelBase
{
private DialogViewModelHost _dialogViewModelHost;
private DialogSession _session;
protected DialogViewModelBase(IModelValidator validator) : base(validator)
{
}
@@ -13,8 +16,17 @@ namespace Artemis.UI.Shared.Services.Dialog
{
}
public DialogViewModelHost DialogViewModelHost { get; set; }
public DialogSession Session { get; private set; }
public DialogViewModelHost DialogViewModelHost
{
get => _dialogViewModelHost;
set => SetAndNotify(ref _dialogViewModelHost, value);
}
public DialogSession Session
{
get => _session;
private set => SetAndNotify(ref _session, value);
}
public void OnDialogOpened(object sender, DialogOpenedEventArgs e)
{