try to fixed #184
This commit is contained in:
1 parent
4a335f46cb
commit
ee9453964b
4 files changed
+14
-13
No files matched your search
@@ -1,4 +1,5 @@
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Globalization;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Windows;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Animation;
|
||||
@@ -70,15 +71,15 @@ namespace HandyControl.Media.Animation
|
||||
{
|
||||
if (_numbersFrom == null)
|
||||
{
|
||||
var geometryStr = defaultOriginValue.ToString();
|
||||
var geometryStr = defaultOriginValue.ToString(CultureInfo.InvariantCulture);
|
||||
AnimationHelper.DecomposeGeometryStr(geometryStr, out _numbersFrom);
|
||||
}
|
||||
|
||||
if (_numbersTo == null)
|
||||
{
|
||||
var geometryStr = defaultDestinationValue.ToString();
|
||||
var geometryStr = defaultDestinationValue.ToString(CultureInfo.InvariantCulture);
|
||||
AnimationHelper.DecomposeGeometryStr(geometryStr, out _numbersTo);
|
||||
_strings = Regex.Split(geometryStr, RegularPatterns.DigitsPattern, RegexOptions.CultureInvariant);
|
||||
_strings = Regex.Split(geometryStr, RegularPatterns.DigitsPattern);
|
||||
}
|
||||
|
||||
UpdateValue();
|
||||
@@ -128,7 +129,7 @@ namespace HandyControl.Media.Animation
|
||||
var obj = (GeometryAnimation) d;
|
||||
if (e.NewValue is Geometry geometry)
|
||||
{
|
||||
AnimationHelper.DecomposeGeometryStr(geometry.ToString(), out obj._numbersFrom);
|
||||
AnimationHelper.DecomposeGeometryStr(geometry.ToString(CultureInfo.InvariantCulture), out obj._numbersFrom);
|
||||
obj.UpdateValue();
|
||||
}
|
||||
}
|
||||
@@ -147,9 +148,9 @@ namespace HandyControl.Media.Animation
|
||||
var obj = (GeometryAnimation)d;
|
||||
if (e.NewValue is Geometry geometry)
|
||||
{
|
||||
var geometryStr = geometry.ToString();
|
||||
var geometryStr = geometry.ToString(CultureInfo.InvariantCulture);
|
||||
AnimationHelper.DecomposeGeometryStr(geometryStr, out obj._numbersTo);
|
||||
obj._strings = Regex.Split(geometryStr, RegularPatterns.DigitsPattern, RegexOptions.CultureInvariant);
|
||||
obj._strings = Regex.Split(geometryStr, RegularPatterns.DigitsPattern);
|
||||
obj.UpdateValue();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Globalization;
|
||||
using System.Text.RegularExpressions;
|
||||
using System.Windows;
|
||||
using System.Windows.Markup;
|
||||
@@ -27,7 +28,7 @@ namespace HandyControl.Media.Animation
|
||||
return null;
|
||||
}
|
||||
|
||||
return _strings ??= Regex.Split(_keyFrames[0].Value.ToString(), RegularPatterns.DigitsPattern, RegexOptions.CultureInvariant);
|
||||
return _strings ??= Regex.Split(_keyFrames[0].Value.ToString(CultureInfo.InvariantCulture), RegularPatterns.DigitsPattern);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -212,7 +213,7 @@ namespace HandyControl.Media.Animation
|
||||
|
||||
if (currentResolvedKeyFrameIndex == 0)
|
||||
{
|
||||
AnimationHelper.DecomposeGeometryStr(defaultOriginValue.ToString(), out fromValue);
|
||||
AnimationHelper.DecomposeGeometryStr(defaultOriginValue.ToString(CultureInfo.InvariantCulture), out fromValue);
|
||||
|
||||
currentSegmentProgress = currentTime.TotalMilliseconds / _sortedResolvedKeyFrames[0]._resolvedKeyTime.TotalMilliseconds;
|
||||
}
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using System.Globalization;
|
||||
using System.Windows;
|
||||
using System.Windows.Media;
|
||||
using System.Windows.Media.Animation;
|
||||
@@ -15,7 +16,7 @@ public abstract class GeometryKeyFrame : Freezable, IKeyFrame
|
||||
|
||||
protected GeometryKeyFrame(Geometry value)
|
||||
{
|
||||
AnimationHelper.DecomposeGeometryStr(value.ToString(), out var arr);
|
||||
AnimationHelper.DecomposeGeometryStr(value.ToString(CultureInfo.InvariantCulture), out var arr);
|
||||
Numbers = arr;
|
||||
Value = value;
|
||||
}
|
||||
@@ -44,7 +45,7 @@ public abstract class GeometryKeyFrame : Freezable, IKeyFrame
|
||||
{
|
||||
var obj = (GeometryKeyFrame) d;
|
||||
var v = (Geometry) e.NewValue;
|
||||
AnimationHelper.DecomposeGeometryStr(v.ToString(), out var arr);
|
||||
AnimationHelper.DecomposeGeometryStr(v.ToString(CultureInfo.InvariantCulture), out var arr);
|
||||
obj.Numbers = arr;
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,6 @@ using System.Windows;
|
||||
using System.Windows.Markup;
|
||||
using HandyControl.Controls;
|
||||
using HandyControl.Data;
|
||||
using System.Threading;
|
||||
|
||||
namespace HandyControl.Tools
|
||||
{
|
||||
@@ -44,7 +43,6 @@ namespace HandyControl.Tools
|
||||
public void SetLang(string lang)
|
||||
{
|
||||
Application.Current.Dispatcher.Thread.CurrentUICulture = new CultureInfo(lang);
|
||||
Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
|
||||
Lang = XmlLanguage.GetLanguage(lang);
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user