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

Modifiers - Cannot input negative values - closes #519

Browse Source
This commit is contained in:
SpoinkyNL 2021-02-02 19:32:22 +01:00
parent bd6c93b292
commit 1c10eb8aa4
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Artemis.UI/DefaultTypes/DataModel/Input/DoubleDataModelInputViewModel.cs
View File

@ -14,9 +14,12 @@ namespace Artemis.UI.DefaultTypes.DataModel.Input
public void NumberValidationTextBox(object sender, TextCompositionEventArgs e) public void NumberValidationTextBox(object sender, TextCompositionEventArgs e)
{ {
string seperator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator; if (e.Text != "-")
Regex regex = new("^[" + seperator + "][0-9]+$|^[0-9]*[" + seperator + "]{0,1}[0-9]*$"); {
e.Handled = !regex.IsMatch(e.Text); string seperator = CultureInfo.CurrentCulture.NumberFormat.NumberDecimalSeparator;
Regex regex = new("^[" + seperator + "][0-9]+$|^[0-9]*[" + seperator + "]{0,1}[0-9]*$");
e.Handled = !regex.IsMatch(e.Text);
}
} }
} }
} }

3
src/Artemis.UI/Screens/ProfileEditor/LayerProperties/DataBindings/DataBindingViewModel.cs
View File

@ -64,6 +64,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
{ {
if (!SetAndNotify(ref _selectedDataBindingMode, value)) return; if (!SetAndNotify(ref _selectedDataBindingMode, value)) return;
ApplyDataBindingMode(); ApplyDataBindingMode();
Update();
} }
} }
@ -145,6 +146,7 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
if (Registration.DataBinding == null) if (Registration.DataBinding == null)
{ {
IsDataBindingEnabled = false;
IsEasingTimeEnabled = false; IsEasingTimeEnabled = false;
return; return;
} }
@ -199,7 +201,6 @@ namespace Artemis.UI.Screens.ProfileEditor.LayerProperties.DataBindings
Registration.DataBinding.ChangeDataBindingMode(SelectedDataBindingMode); Registration.DataBinding.ChangeDataBindingMode(SelectedDataBindingMode);
CreateDataBindingModeModeViewModel(); CreateDataBindingModeModeViewModel();
_profileEditorService.UpdateSelectedProfileElement(); _profileEditorService.UpdateSelectedProfileElement();
} }