merged pr

This commit is contained in:
NaBian committed 2019-07-25 23:02:21 +08:00
1 parent c500e9c1e6
commit 1739e81551
3 files changed
+10 -10

No files matched your search

@@ -261,7 +261,7 @@ namespace HandyControl.Controls
public bool IsError public bool IsError
{ {
get => (bool) GetValue(IsErrorProperty); get => (bool)GetValue(IsErrorProperty);
set => SetValue(IsErrorProperty, value); set => SetValue(IsErrorProperty, value);
} }
@@ -270,7 +270,7 @@ namespace HandyControl.Controls
public string ErrorStr public string ErrorStr
{ {
get => (string) GetValue(ErrorStrProperty); get => (string)GetValue(ErrorStrProperty);
set => SetValue(ErrorStrProperty, value); set => SetValue(ErrorStrProperty, value);
} }
@@ -279,7 +279,7 @@ namespace HandyControl.Controls
public TextType TextType public TextType TextType
{ {
get => (TextType) GetValue(TextTypeProperty); get => (TextType)GetValue(TextTypeProperty);
set => SetValue(TextTypeProperty, value); set => SetValue(TextTypeProperty, value);
} }
@@ -288,7 +288,7 @@ namespace HandyControl.Controls
public bool ShowClearButton public bool ShowClearButton
{ {
get => (bool) GetValue(ShowClearButtonProperty); get => (bool)GetValue(ShowClearButtonProperty);
set => SetValue(ShowClearButtonProperty, value); set => SetValue(ShowClearButtonProperty, value);
} }
@@ -297,7 +297,7 @@ namespace HandyControl.Controls
private static void OnClockChanged(DependencyObject d, DependencyPropertyChangedEventArgs e) private static void OnClockChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
{ {
var ctl = (TimePicker) d; var ctl = (TimePicker)d;
var oldClock = e.OldValue as ClockBase; var oldClock = e.OldValue as ClockBase;
var newClock = e.NewValue as ClockBase; var newClock = e.NewValue as ClockBase;
@@ -317,7 +317,7 @@ namespace HandyControl.Controls
public ClockBase Clock public ClockBase Clock
{ {
get => (ClockBase) GetValue(ClockProperty); get => (ClockBase)GetValue(ClockProperty);
set => SetValue(ClockProperty, value); set => SetValue(ClockProperty, value);
} }
@@ -644,7 +644,7 @@ namespace HandyControl.Controls
if (SelectedTime != null) if (SelectedTime != null)
{ {
var newtext = DateTimeToString((DateTime) SelectedTime); var newtext = DateTimeToString((DateTime)SelectedTime);
SafeSetText(newtext); SafeSetText(newtext);
return SelectedTime; return SelectedTime;
} }
@@ -210,7 +210,7 @@ namespace HandyControl.Controls
} }
if (IsEnableAnimation) if (IsEnableAnimation)
{ {
_headerPanel.ClearValue(TabPanel.FluidMoveDurationProperty); _headerPanel.SetCurrentValue(TabPanel.FluidMoveDurationProperty, new Duration(TimeSpan.FromMilliseconds(200)));
} }
else else
{ {
@@ -311,7 +311,7 @@ namespace HandyControl.Controls
Items.Insert(0, item); Items.Insert(0, item);
if (IsEnableAnimation) if (IsEnableAnimation)
{ {
_headerPanel.ClearValue(TabPanel.FluidMoveDurationProperty); _headerPanel.SetCurrentValue(TabPanel.FluidMoveDurationProperty, new Duration(TimeSpan.FromMilliseconds(200)));
} }
else else
{ {
@@ -154,7 +154,7 @@ namespace HandyControl.Controls
if (TabControlParent.IsEnableAnimation) if (TabControlParent.IsEnableAnimation)
{ {
TabPanel.ClearValue(TabPanel.FluidMoveDurationProperty); TabPanel.SetCurrentValue(TabPanel.FluidMoveDurationProperty, new Duration(TimeSpan.FromMilliseconds(200)));
} }
else else
{ {