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
+39 -39

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, "");
})); }));
} }
@@ -85,7 +85,7 @@ namespace HandyControl.Controls
UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged, UpdateSourceTrigger = UpdateSourceTrigger.PropertyChanged,
Mode = BindingMode.OneWayToSource, Mode = BindingMode.OneWayToSource,
#if !netle40 #if !netle40
Delay = 500, Delay = 500,
#endif #endif
Source = this Source = this
}); });
@@ -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;
})); }));
} }
@@ -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);
} }
@@ -497,29 +497,29 @@ namespace HandyControl.Controls
switch (e.Key) switch (e.Key)
{ {
case Key.System: case Key.System:
{
switch (e.SystemKey)
{ {
case Key.Down: switch (e.SystemKey)
{ {
if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt) case Key.Down:
{ {
TogglePopUp(); if ((Keyboard.Modifiers & ModifierKeys.Alt) == ModifierKeys.Alt)
return true; {
} TogglePopUp();
return true;
}
break; break;
}
} }
break;
} }
break;
}
case Key.Enter: case Key.Enter:
{ {
SetSelectedTime(); SetSelectedTime();
return true; return true;
} }
} }
return false; return false;
@@ -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
{ {