DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2025-12-13 05:48:35 +00:00
Code Issues Releases Wiki Activity

Layer brush/effect dialogs - Fixed default location

Browse Source 
Layer properties - Give it a best effort to avoid null base values
This commit is contained in:
Robert 2021-04-08 23:51:56 +02:00
parent af496da647
commit 8066586328
5 changed files with 53 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Artemis.Core/Models/Profile/LayerProperties/LayerProperty.cs
View File

@ -34,7 +34,15 @@ namespace Artemis.Core
CurrentValue = default!;
DefaultValue = default!;
_baseValue = typeof(T).IsValueType ? default! : Activator.CreateInstance<T>();
// We'll try our best...
// TODO: Consider alternatives
if (typeof(T).IsValueType)
_baseValue = default!;
else if (typeof(T).GetConstructor(Type.EmptyTypes) != null)
_baseValue = Activator.CreateInstance<T>();
else
_baseValue = default!;
_keyframes = new List<LayerPropertyKeyframe<T>>();
}

6
src/Artemis.UI/Screens/ProfileEditor/Windows/LayerBrushSettingsWindowView.xaml
View File

@ -12,10 +12,8 @@
Background="{DynamicResource MaterialDesignPaper}"
FontFamily="pack://application:,,,/MaterialDesignThemes.Wpf;component/Resources/Roboto/#Roboto"
UseLayoutRounding="True"
MinWidth="400"
MinHeight="400"
Width="{Binding Width}"
Height="{Binding Height}"
Height="800"
Width="800"
d:DesignHeight="800"
d:DesignWidth="800"
d:DataContext="{d:DesignInstance windows:LayerBrushSettingsWindowViewModel}"

32
src/Artemis.UI/Screens/ProfileEditor/Windows/LayerBrushSettingsWindowViewModel.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Windows;
using Artemis.UI.Shared.LayerBrushes;
using Stylet;
@ -6,28 +7,35 @@ namespace Artemis.UI.Screens.ProfileEditor.Windows
{
public class LayerBrushSettingsWindowViewModel : Conductor<BrushConfigurationViewModel>
{
private int _height;
private int _width;
private readonly LayerBrushConfigurationDialog _configuration;
public LayerBrushSettingsWindowViewModel(BrushConfigurationViewModel configurationViewModel, LayerBrushConfigurationDialog configuration)
{
_configuration = configuration;
ActiveItem = configurationViewModel ?? throw new ArgumentNullException(nameof(configurationViewModel));
ActiveItem.Closed += ActiveItemOnClosed;
Width = configuration.DialogWidth;
Height = configuration.DialogHeight;
}
public int Width
#region Overrides of Screen
/// <inheritdoc />
protected override void OnViewLoaded()
{
get => _width;
set => SetAndNotify(ref _width, value);
// Setting the width/height via a binding and depending on WindowStartupLocation does not work
Window window = View as Window;
Window mainWindow = Application.Current.MainWindow;
if (window == null || mainWindow == null)
return;
window.Width = _configuration.DialogWidth;
window.Height = _configuration.DialogHeight;
window.Left = mainWindow.Left + (mainWindow.Width - window.Width) / 2;
window.Top = mainWindow.Top + (mainWindow.Height - window.Height) / 2;
base.OnViewLoaded();
}
public int Height
{
get => _height;
set => SetAndNotify(ref _height, value);
}
#endregion
private void ActiveItemOnClosed(object sender, CloseEventArgs e)
{

4
src/Artemis.UI/Screens/ProfileEditor/Windows/LayerEffectSettingsWindowView.xaml
View File

@ -14,8 +14,8 @@
UseLayoutRounding="True"
MinWidth="400"
MinHeight="400"
Width="{Binding Width}"
Height="{Binding Height}"
Width="800"
Height="800"
d:DesignHeight="800"
d:DesignWidth="800"
d:DataContext="{d:DesignInstance windows:LayerEffectSettingsWindowViewModel}"

32
src/Artemis.UI/Screens/ProfileEditor/Windows/LayerEffectSettingsWindowViewModel.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Windows;
using Artemis.UI.Shared.LayerEffects;
using Stylet;
@ -6,28 +7,35 @@ namespace Artemis.UI.Screens.ProfileEditor.Windows
{
public class LayerEffectSettingsWindowViewModel : Conductor<EffectConfigurationViewModel>
{
private int _height;
private int _width;
private LayerEffectConfigurationDialog _configuration;
public LayerEffectSettingsWindowViewModel(EffectConfigurationViewModel configurationViewModel, LayerEffectConfigurationDialog configuration)
{
_configuration = configuration;
ActiveItem = configurationViewModel ?? throw new ArgumentNullException(nameof(configurationViewModel));
ActiveItem.Closed += ActiveItemOnClosed;
Width = configuration.DialogWidth;
Height = configuration.DialogHeight;
}
public int Width
#region Overrides of Screen
/// <inheritdoc />
protected override void OnViewLoaded()
{
get => _width;
set => SetAndNotify(ref _width, value);
// Setting the width/height via a binding and depending on WindowStartupLocation does not work
Window window = View as Window;
Window mainWindow = Application.Current.MainWindow;
if (window == null || mainWindow == null)
return;
window.Width = _configuration.DialogWidth;
window.Height = _configuration.DialogHeight;
window.Left = mainWindow.Left + (mainWindow.Width - window.Width) / 2;
window.Top = mainWindow.Top + (mainWindow.Height - window.Height) / 2;
base.OnViewLoaded();
}
public int Height
{
get => _height;
set => SetAndNotify(ref _height, value);
}
#endregion
private void ActiveItemOnClosed(object sender, CloseEventArgs e)
{