CodeMirror/OnTopReplica
1
0
Fork 0
mirror of https://github.com/LorenzCK/OnTopReplica.git synced 2024-04-28 01:23:14 +12:00
Code Issues Projects Releases Wiki Activity

SizeConverter : update regex value to allow negative values

Browse source
This commit is contained in:
Romain Aubert 2023-07-05 08:22:08 +02:00 committed by Lorenz Cuno Klopfenstein
parent f59db2c01e
commit 63e9487423
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/OnTopReplica/StartupOptions/SizeConverter.cs
View file

@ -10,7 +10,7 @@ namespace OnTopReplica.StartupOptions {
class SizeConverter : TypeConverter {
public override object ConvertFrom(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value) {
if (value != null) {
if(value != null) {
var sVal = value.ToString();
return StringToSize(sVal);
}
@ -27,26 +27,26 @@ namespace OnTopReplica.StartupOptions {
}
public override object ConvertTo(ITypeDescriptorContext context, System.Globalization.CultureInfo culture, object value, Type destinationType) {
if (value == null)
if(value == null)
return base.ConvertTo(context, culture, value, destinationType);
if (destinationType == typeof(Size)) {
if(destinationType == typeof(Size)) {
var sVal = value.ToString();
return StringToSize(sVal);
}
else if (destinationType == typeof(string)) {
if (value is Size) {
else if(destinationType == typeof(string)) {
if(value is Size) {
Size sValue = (Size)value;
return string.Format("{0}, {1}", sValue.Width, sValue.Height);
}
return value.ToString();
}
else
return base.ConvertTo(context, culture, value, destinationType);
}
static Regex _sizeRegex = new Regex("^\\D*(?<x>\\d*)\\s*,\\s*(?<y>\\d*)\\D*$",
static Regex _sizeRegex = new Regex("^[^0-9-]*(?<x>-?\\d*)\\s*,\\s*(?<y>-?\\d*)\\D*$",
RegexOptions.Compiled | RegexOptions.CultureInvariant | RegexOptions.Singleline);
private Size StringToSize(string s) {
@ -55,7 +55,7 @@ namespace OnTopReplica.StartupOptions {
var x = match.Groups["x"];
var y = match.Groups["y"];
if (!match.Success || !x.Success || !y.Success)
if(!match.Success || !x.Success || !y.Success)
throw new ArgumentException("Cannot convert '" + s + "' to coordinates pair.");
var xVal = Int32.Parse(x.Value);