Merge pull request #138 from HandyOrg/pr/135

Pr/135
This commit is contained in:
NaBian authored and GitHub committed 2019-07-25 23:03:10 +08:00
commit 9a903a9d5b
8 files changed
+15 -15

No files matched your search

@@ -43,10 +43,10 @@ namespace HandyControl.Controls
{ {
CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) => CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
{ {
ClearValue(SelectedValueProperty); SetCurrentValue(SelectedValueProperty, null);
ClearValue(SelectedItemProperty); SetCurrentValue(SelectedItemProperty, null);
ClearValue(SelectedIndexProperty); SetCurrentValue(SelectedIndexProperty, -1);
ClearValue(TextProperty); SetCurrentValue(TextProperty, "");
})); }));
} }
@@ -20,8 +20,8 @@ namespace HandyControl.Controls
{ {
CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) => CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
{ {
ClearValue(SelectedDateProperty); SetCurrentValue(SelectedDateProperty, null);
ClearValue(TextProperty); SetCurrentValue(TextProperty, "");
})); }));
} }
@@ -82,8 +82,8 @@ namespace HandyControl.Controls
InitCalendarWithClock(); InitCalendarWithClock();
CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) => CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
{ {
ClearValue(SelectedDateTimeProperty); SetCurrentValue(SelectedDateTimeProperty, null);
ClearValue(TextProperty); SetCurrentValue(TextProperty, "");
_textBox.Text = string.Empty; _textBox.Text = string.Empty;
})); }));
} }
@@ -43,7 +43,7 @@ namespace HandyControl.Controls
})); }));
CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) => CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
{ {
ClearValue(ValueProperty); SetCurrentValue(ValueProperty, 0d);
_textBox.Text = string.Empty; _textBox.Text = string.Empty;
})); }));
@@ -15,7 +15,7 @@ namespace HandyControl.Controls
{ {
CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) => CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
{ {
ClearValue(TextProperty); SetCurrentValue(TextProperty, "");
})); }));
} }
@@ -80,8 +80,8 @@ namespace HandyControl.Controls
Clock = new Clock(); Clock = new Clock();
CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) => CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
{ {
ClearValue(SelectedTimeProperty); SetCurrentValue(SelectedTimeProperty, null);
ClearValue(TextProperty); SetCurrentValue(TextProperty, "");
_textBox.Text = string.Empty; _textBox.Text = string.Empty;
})); }));
} }
@@ -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
{ {