11 files changed
+395
-166
No files matched your search
@@ -17,7 +17,11 @@
|
|||||||
<controls:TimePicker Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource TimePickerExtend}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
|
<controls:TimePicker Width="380" controls:InfoElement.TitleWidth="140" controls:InfoElement.TitleAlignment="Left" controls:InfoElement.Placeholder="{x:Static langs:Lang.PlsEnterContent}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr3}" Style="{StaticResource TimePickerExtend}" controls:InfoElement.Necessary="True" Margin="0,16,0,0"/>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
<StackPanel Margin="32,0,0,0">
|
<StackPanel Margin="32,0,0,0">
|
||||||
<controls:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus}"/>
|
<controls:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus}">
|
||||||
|
<controls:TimePicker.Clock>
|
||||||
|
<controls:ListClock/>
|
||||||
|
</controls:TimePicker.Clock>
|
||||||
|
</controls:TimePicker>
|
||||||
<controls:TimePicker Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource TimePickerPlus}"/>
|
<controls:TimePicker Margin="0,16,0,0" IsEnabled="False" Style="{StaticResource TimePickerPlus}"/>
|
||||||
|
|
||||||
<controls:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>
|
<controls:TimePicker ShowClearButton="True" Style="{StaticResource TimePickerPlus}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>
|
||||||
|
|||||||
@@ -99,15 +99,6 @@ namespace HandyControl.Controls
|
|||||||
set => SetValue(DateTimeFormatProperty, value);
|
set => SetValue(DateTimeFormatProperty, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static readonly DependencyProperty ClockStyleProperty = DependencyProperty.Register(
|
|
||||||
"ClockStyle", typeof(Style), typeof(DateTimePicker), new PropertyMetadata(default(Style)));
|
|
||||||
|
|
||||||
public Style ClockStyle
|
|
||||||
{
|
|
||||||
get => (Style) GetValue(ClockStyleProperty);
|
|
||||||
set => SetValue(ClockStyleProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static readonly DependencyProperty CalendarStyleProperty = DependencyProperty.Register(
|
public static readonly DependencyProperty CalendarStyleProperty = DependencyProperty.Register(
|
||||||
"CalendarStyle", typeof(Style), typeof(DateTimePicker), new PropertyMetadata(default(Style)));
|
"CalendarStyle", typeof(Style), typeof(DateTimePicker), new PropertyMetadata(default(Style)));
|
||||||
|
|
||||||
|
|||||||
@@ -34,8 +34,6 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
#region Data
|
#region Data
|
||||||
|
|
||||||
private Clock _clock;
|
|
||||||
|
|
||||||
private string _defaultText;
|
private string _defaultText;
|
||||||
|
|
||||||
private ButtonBase _dropDownButton;
|
private ButtonBase _dropDownButton;
|
||||||
@@ -79,7 +77,7 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
public TimePicker()
|
public TimePicker()
|
||||||
{
|
{
|
||||||
InitClock();
|
Clock = new Clock();
|
||||||
CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
|
CommandBindings.Add(new CommandBinding(ControlCommands.Clear, (s, e) =>
|
||||||
{
|
{
|
||||||
ClearValue(SelectedTimeProperty);
|
ClearValue(SelectedTimeProperty);
|
||||||
@@ -103,18 +101,6 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
#endregion TimeFormat
|
#endregion TimeFormat
|
||||||
|
|
||||||
#region ClockStyle
|
|
||||||
|
|
||||||
public Style ClockStyle
|
|
||||||
{
|
|
||||||
get => (Style)GetValue(ClockStyleProperty);
|
|
||||||
set => SetValue(ClockStyleProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static readonly DependencyProperty ClockStyleProperty = DependencyProperty.Register("ClockStyle", typeof(Style), typeof(TimePicker));
|
|
||||||
|
|
||||||
#endregion CalendarStyle
|
|
||||||
|
|
||||||
#region DisplayTime
|
#region DisplayTime
|
||||||
|
|
||||||
public DateTime DisplayTime
|
public DateTime DisplayTime
|
||||||
@@ -133,8 +119,8 @@ namespace HandyControl.Controls
|
|||||||
private static object CoerceDisplayTime(DependencyObject d, object value)
|
private static object CoerceDisplayTime(DependencyObject d, object value)
|
||||||
{
|
{
|
||||||
var dp = (TimePicker)d;
|
var dp = (TimePicker)d;
|
||||||
dp._clock.DisplayTime = (DateTime)value;
|
dp.Clock.DisplayTime = (DateTime)value;
|
||||||
return dp._clock.DisplayTime;
|
return dp.Clock.DisplayTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion DisplayTime
|
#endregion DisplayTime
|
||||||
@@ -170,7 +156,7 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
dp.Dispatcher.BeginInvoke(DispatcherPriority.Input, (Action)delegate
|
dp.Dispatcher.BeginInvoke(DispatcherPriority.Input, (Action)delegate
|
||||||
{
|
{
|
||||||
dp._clock.Focus();
|
dp.Clock.Focus();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -212,8 +198,8 @@ namespace HandyControl.Controls
|
|||||||
private static object CoerceSelectedTime(DependencyObject d, object value)
|
private static object CoerceSelectedTime(DependencyObject d, object value)
|
||||||
{
|
{
|
||||||
var dp = (TimePicker)d;
|
var dp = (TimePicker)d;
|
||||||
dp._clock.SelectedTime = (DateTime?)value;
|
dp.Clock.SelectedTime = (DateTime?)value;
|
||||||
return dp._clock.SelectedTime;
|
return dp.Clock.SelectedTime;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion SelectedDate
|
#endregion SelectedDate
|
||||||
@@ -306,6 +292,35 @@ namespace HandyControl.Controls
|
|||||||
set => SetValue(ShowClearButtonProperty, value);
|
set => SetValue(ShowClearButtonProperty, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty ClockProperty = DependencyProperty.Register(
|
||||||
|
"Clock", typeof(ClockBase), typeof(TimePicker), new FrameworkPropertyMetadata(default(Clock), FrameworkPropertyMetadataOptions.NotDataBindable, OnClockChanged));
|
||||||
|
|
||||||
|
private static void OnClockChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||||
|
{
|
||||||
|
var ctl = (TimePicker) d;
|
||||||
|
var oldClock = e.OldValue as ClockBase;
|
||||||
|
var newClock = e.NewValue as ClockBase;
|
||||||
|
|
||||||
|
if (oldClock != null)
|
||||||
|
{
|
||||||
|
oldClock.SelectedTimeChanged -= ctl.Clock_SelectedTimeChanged;
|
||||||
|
oldClock.Confirmed -= ctl.Clock_Confirmed;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (newClock != null)
|
||||||
|
{
|
||||||
|
newClock.ShowConfirmButton = true;
|
||||||
|
newClock.SelectedTimeChanged += ctl.Clock_SelectedTimeChanged;
|
||||||
|
newClock.Confirmed += ctl.Clock_Confirmed;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public ClockBase Clock
|
||||||
|
{
|
||||||
|
get => (ClockBase) GetValue(ClockProperty);
|
||||||
|
set => SetValue(ClockProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
#endregion Public Properties
|
#endregion Public Properties
|
||||||
|
|
||||||
#region Public Methods
|
#region Public Methods
|
||||||
@@ -374,7 +389,7 @@ namespace HandyControl.Controls
|
|||||||
_popUp.PreviewMouseLeftButtonDown += PopUp_PreviewMouseLeftButtonDown;
|
_popUp.PreviewMouseLeftButtonDown += PopUp_PreviewMouseLeftButtonDown;
|
||||||
_popUp.Opened += PopUp_Opened;
|
_popUp.Opened += PopUp_Opened;
|
||||||
_popUp.Closed += PopUp_Closed;
|
_popUp.Closed += PopUp_Closed;
|
||||||
_popUp.Child = _clock;
|
_popUp.Child = Clock;
|
||||||
|
|
||||||
if (IsDropDownOpen)
|
if (IsDropDownOpen)
|
||||||
{
|
{
|
||||||
@@ -439,20 +454,7 @@ namespace HandyControl.Controls
|
|||||||
throw new Exception();
|
throw new Exception();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void InitClock()
|
private void TextBox_LostFocus(object sender, RoutedEventArgs e) => SetSelectedTime();
|
||||||
{
|
|
||||||
_clock = new Clock
|
|
||||||
{
|
|
||||||
ShowConfirmButton = true
|
|
||||||
};
|
|
||||||
_clock.SelectedTimeChanged += Clock_SelectedTimeChanged;
|
|
||||||
_clock.Confirmed += Clock_Confirmed;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void TextBox_LostFocus(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
SetSelectedTime();
|
|
||||||
}
|
|
||||||
|
|
||||||
private void SetIsHandlerSuspended(DependencyProperty property, bool value)
|
private void SetIsHandlerSuspended(DependencyProperty property, bool value)
|
||||||
{
|
{
|
||||||
@@ -560,7 +562,7 @@ namespace HandyControl.Controls
|
|||||||
SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
|
SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.TrueBox);
|
||||||
}
|
}
|
||||||
|
|
||||||
_clock?.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
|
Clock?.MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
|
||||||
|
|
||||||
OnClockOpened(new RoutedEventArgs());
|
OnClockOpened(new RoutedEventArgs());
|
||||||
}
|
}
|
||||||
@@ -572,7 +574,7 @@ namespace HandyControl.Controls
|
|||||||
SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
|
SetCurrentValue(IsDropDownOpenProperty, ValueBoxes.FalseBox);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_clock.IsKeyboardFocusWithin)
|
if (Clock.IsKeyboardFocusWithin)
|
||||||
{
|
{
|
||||||
MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
|
MoveFocus(new TraversalRequest(FocusNavigationDirection.First));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -192,7 +192,7 @@ namespace HandyControl.Controls
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 当前垂直滚动偏移
|
/// 当前垂直滚动偏移
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private static readonly DependencyProperty CurrentVerticalOffsetProperty = DependencyProperty.Register(
|
internal static readonly DependencyProperty CurrentVerticalOffsetProperty = DependencyProperty.Register(
|
||||||
"CurrentVerticalOffset", typeof(double), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.Double0Box, OnCurrentVerticalOffsetChanged));
|
"CurrentVerticalOffset", typeof(double), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.Double0Box, OnCurrentVerticalOffsetChanged));
|
||||||
|
|
||||||
private static void OnCurrentVerticalOffsetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
private static void OnCurrentVerticalOffsetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||||
@@ -206,7 +206,7 @@ namespace HandyControl.Controls
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 当前垂直滚动偏移
|
/// 当前垂直滚动偏移
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private double CurrentVerticalOffset
|
internal double CurrentVerticalOffset
|
||||||
{
|
{
|
||||||
// ReSharper disable once UnusedMember.Local
|
// ReSharper disable once UnusedMember.Local
|
||||||
get => (double) GetValue(CurrentVerticalOffsetProperty);
|
get => (double) GetValue(CurrentVerticalOffsetProperty);
|
||||||
@@ -216,7 +216,7 @@ namespace HandyControl.Controls
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 当前水平滚动偏移
|
/// 当前水平滚动偏移
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public static readonly DependencyProperty CurrentHorizontalOffsetProperty = DependencyProperty.Register(
|
internal static readonly DependencyProperty CurrentHorizontalOffsetProperty = DependencyProperty.Register(
|
||||||
"CurrentHorizontalOffset", typeof(double), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.Double0Box, OnCurrentHorizontalOffsetChanged));
|
"CurrentHorizontalOffset", typeof(double), typeof(ScrollViewer), new PropertyMetadata(ValueBoxes.Double0Box, OnCurrentHorizontalOffsetChanged));
|
||||||
|
|
||||||
private static void OnCurrentHorizontalOffsetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
private static void OnCurrentHorizontalOffsetChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||||
@@ -230,7 +230,7 @@ namespace HandyControl.Controls
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// 当前水平滚动偏移
|
/// 当前水平滚动偏移
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public double CurrentHorizontalOffset
|
internal double CurrentHorizontalOffset
|
||||||
{
|
{
|
||||||
get => (double) GetValue(CurrentHorizontalOffsetProperty);
|
get => (double) GetValue(CurrentHorizontalOffsetProperty);
|
||||||
set => SetValue(CurrentHorizontalOffsetProperty, value);
|
set => SetValue(CurrentHorizontalOffsetProperty, value);
|
||||||
|
|||||||
@@ -6,26 +6,23 @@ using System.Windows.Controls.Primitives;
|
|||||||
using System.Windows.Data;
|
using System.Windows.Data;
|
||||||
using System.Windows.Input;
|
using System.Windows.Input;
|
||||||
using System.Windows.Media;
|
using System.Windows.Media;
|
||||||
using HandyControl.Data;
|
|
||||||
using HandyControl.Tools;
|
using HandyControl.Tools;
|
||||||
|
|
||||||
namespace HandyControl.Controls
|
namespace HandyControl.Controls
|
||||||
{
|
{
|
||||||
[TemplatePart(Name = ElementButtonAm, Type = typeof(RadioButton))]
|
[TemplatePart(Name = ElementButtonAm, Type = typeof(RadioButton))]
|
||||||
[TemplatePart(Name = ElementButtonPm, Type = typeof(RadioButton))]
|
[TemplatePart(Name = ElementButtonPm, Type = typeof(RadioButton))]
|
||||||
[TemplatePart(Name = ElementButtonConfirm, Type = typeof(Button))]
|
|
||||||
[TemplatePart(Name = ElementCanvas, Type = typeof(Canvas))]
|
[TemplatePart(Name = ElementCanvas, Type = typeof(Canvas))]
|
||||||
[TemplatePart(Name = ElementBorderTitle, Type = typeof(Border))]
|
[TemplatePart(Name = ElementBorderTitle, Type = typeof(Border))]
|
||||||
[TemplatePart(Name = ElementBorderClock, Type = typeof(Border))]
|
[TemplatePart(Name = ElementBorderClock, Type = typeof(Border))]
|
||||||
[TemplatePart(Name = ElementPanelNum, Type = typeof(CirclePanel))]
|
[TemplatePart(Name = ElementPanelNum, Type = typeof(CirclePanel))]
|
||||||
[TemplatePart(Name = ElementTimeStr, Type = typeof(TextBlock))]
|
[TemplatePart(Name = ElementTimeStr, Type = typeof(TextBlock))]
|
||||||
public class Clock : Control
|
public class Clock : ClockBase
|
||||||
{
|
{
|
||||||
#region Constants
|
#region Constants
|
||||||
|
|
||||||
private const string ElementButtonAm = "PART_ButtonAm";
|
private const string ElementButtonAm = "PART_ButtonAm";
|
||||||
private const string ElementButtonPm = "PART_ButtonPm";
|
private const string ElementButtonPm = "PART_ButtonPm";
|
||||||
private const string ElementButtonConfirm = "PART_ButtonConfirm";
|
|
||||||
private const string ElementCanvas = "PART_Canvas";
|
private const string ElementCanvas = "PART_Canvas";
|
||||||
private const string ElementBorderTitle = "PART_BorderTitle";
|
private const string ElementBorderTitle = "PART_BorderTitle";
|
||||||
private const string ElementBorderClock = "PART_BorderClock";
|
private const string ElementBorderClock = "PART_BorderClock";
|
||||||
@@ -40,8 +37,6 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
private RadioButton _buttonPm;
|
private RadioButton _buttonPm;
|
||||||
|
|
||||||
private Button _buttonConfirm;
|
|
||||||
|
|
||||||
private Canvas _canvas;
|
private Canvas _canvas;
|
||||||
|
|
||||||
private Border _borderTitle;
|
private Border _borderTitle;
|
||||||
@@ -60,59 +55,10 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
private int _secValue;
|
private int _secValue;
|
||||||
|
|
||||||
private bool _appliedTemplate;
|
|
||||||
|
|
||||||
#endregion Data
|
#endregion Data
|
||||||
|
|
||||||
#region Public Events
|
|
||||||
|
|
||||||
public static readonly RoutedEvent SelectedTimeChangedEvent =
|
|
||||||
EventManager.RegisterRoutedEvent("SelectedTimeChanged", RoutingStrategy.Direct,
|
|
||||||
typeof(EventHandler<FunctionEventArgs<DateTime?>>), typeof(Clock));
|
|
||||||
|
|
||||||
public event EventHandler<FunctionEventArgs<DateTime?>> SelectedTimeChanged
|
|
||||||
{
|
|
||||||
add => AddHandler(SelectedTimeChangedEvent, value);
|
|
||||||
remove => RemoveHandler(SelectedTimeChangedEvent, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public event EventHandler<FunctionEventArgs<DateTime>> DisplayTimeChanged;
|
|
||||||
|
|
||||||
public event Action Confirmed;
|
|
||||||
|
|
||||||
#endregion Public Events
|
|
||||||
|
|
||||||
#region Public Properties
|
#region Public Properties
|
||||||
|
|
||||||
public static readonly DependencyProperty SelectedTimeProperty = DependencyProperty.Register(
|
|
||||||
"SelectedTime", typeof(DateTime?), typeof(Clock), new PropertyMetadata(default(DateTime?), OnSelectedTimeChanged));
|
|
||||||
|
|
||||||
private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
|
||||||
{
|
|
||||||
var ctl = (Clock)d;
|
|
||||||
var v = (DateTime?)e.NewValue;
|
|
||||||
ctl.DisplayTime = v ?? DateTime.Now;
|
|
||||||
ctl.OnSelectedTimeChanged(new FunctionEventArgs<DateTime?>(SelectedTimeChangedEvent, ctl)
|
|
||||||
{
|
|
||||||
Info = v
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
public DateTime? SelectedTime
|
|
||||||
{
|
|
||||||
get => (DateTime?) GetValue(SelectedTimeProperty);
|
|
||||||
set => SetValue(SelectedTimeProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register(
|
|
||||||
"TimeFormat", typeof(string), typeof(Clock), new PropertyMetadata("HH:mm:ss"));
|
|
||||||
|
|
||||||
public string TimeFormat
|
|
||||||
{
|
|
||||||
get => (string) GetValue(TimeFormatProperty);
|
|
||||||
set => SetValue(TimeFormatProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static readonly DependencyProperty ClockRadioButtonStyleProperty = DependencyProperty.Register(
|
public static readonly DependencyProperty ClockRadioButtonStyleProperty = DependencyProperty.Register(
|
||||||
"ClockRadioButtonStyle", typeof(Style), typeof(Clock), new PropertyMetadata(default(Style)));
|
"ClockRadioButtonStyle", typeof(Style), typeof(Clock), new PropertyMetadata(default(Style)));
|
||||||
|
|
||||||
@@ -122,32 +68,6 @@ namespace HandyControl.Controls
|
|||||||
set => SetValue(ClockRadioButtonStyleProperty, value);
|
set => SetValue(ClockRadioButtonStyleProperty, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static readonly DependencyProperty DisplayTimeProperty = DependencyProperty.Register(
|
|
||||||
"DisplayTime", typeof(DateTime), typeof(Clock), new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault, OnDisplayTimeChanged));
|
|
||||||
|
|
||||||
private static void OnDisplayTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
|
||||||
{
|
|
||||||
var ctl = (Clock) d;
|
|
||||||
var v = (DateTime) e.NewValue;
|
|
||||||
ctl.Update(v);
|
|
||||||
ctl.OnDisplayTimeChanged(new FunctionEventArgs<DateTime>(v));
|
|
||||||
}
|
|
||||||
|
|
||||||
public DateTime DisplayTime
|
|
||||||
{
|
|
||||||
get => (DateTime) GetValue(DisplayTimeProperty);
|
|
||||||
set => SetValue(DisplayTimeProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
internal static readonly DependencyProperty ShowConfirmButtonProperty = DependencyProperty.Register(
|
|
||||||
"ShowConfirmButton", typeof(bool), typeof(Clock), new PropertyMetadata(ValueBoxes.FalseBox));
|
|
||||||
|
|
||||||
internal bool ShowConfirmButton
|
|
||||||
{
|
|
||||||
get => (bool)GetValue(ShowConfirmButtonProperty);
|
|
||||||
set => SetValue(ShowConfirmButtonProperty, value);
|
|
||||||
}
|
|
||||||
|
|
||||||
private int SecValue
|
private int SecValue
|
||||||
{
|
{
|
||||||
get => _secValue;
|
get => _secValue;
|
||||||
@@ -174,7 +94,7 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
public override void OnApplyTemplate()
|
public override void OnApplyTemplate()
|
||||||
{
|
{
|
||||||
_appliedTemplate = false;
|
AppliedTemplate = false;
|
||||||
if (_buttonAm != null)
|
if (_buttonAm != null)
|
||||||
{
|
{
|
||||||
_buttonAm.Click -= ButtonAm_OnClick;
|
_buttonAm.Click -= ButtonAm_OnClick;
|
||||||
@@ -185,9 +105,9 @@ namespace HandyControl.Controls
|
|||||||
_buttonPm.Click -= ButtonPm_OnClick;
|
_buttonPm.Click -= ButtonPm_OnClick;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_buttonConfirm != null)
|
if (ButtonConfirm != null)
|
||||||
{
|
{
|
||||||
_buttonConfirm.Click -= ButtonConfirm_OnClick;
|
ButtonConfirm.Click -= ButtonConfirm_OnClick;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_borderTitle != null)
|
if (_borderTitle != null)
|
||||||
@@ -206,18 +126,18 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
_buttonAm = GetTemplateChild(ElementButtonAm) as RadioButton;
|
_buttonAm = GetTemplateChild(ElementButtonAm) as RadioButton;
|
||||||
_buttonPm = GetTemplateChild(ElementButtonPm) as RadioButton;
|
_buttonPm = GetTemplateChild(ElementButtonPm) as RadioButton;
|
||||||
_buttonConfirm = GetTemplateChild(ElementButtonConfirm) as Button;
|
ButtonConfirm = GetTemplateChild(ElementButtonConfirm) as Button;
|
||||||
_borderTitle = GetTemplateChild(ElementBorderTitle) as Border;
|
_borderTitle = GetTemplateChild(ElementBorderTitle) as Border;
|
||||||
_canvas = GetTemplateChild(ElementCanvas) as Canvas;
|
_canvas = GetTemplateChild(ElementCanvas) as Canvas;
|
||||||
_borderClock = GetTemplateChild(ElementBorderClock) as Border;
|
_borderClock = GetTemplateChild(ElementBorderClock) as Border;
|
||||||
_circlePanel = GetTemplateChild(ElementPanelNum) as CirclePanel;
|
_circlePanel = GetTemplateChild(ElementPanelNum) as CirclePanel;
|
||||||
_blockTime = GetTemplateChild(ElementTimeStr) as TextBlock;
|
_blockTime = GetTemplateChild(ElementTimeStr) as TextBlock;
|
||||||
|
|
||||||
CheckNull();
|
if (!CheckNull()) return;
|
||||||
|
|
||||||
_buttonAm.Click += ButtonAm_OnClick;
|
_buttonAm.Click += ButtonAm_OnClick;
|
||||||
_buttonPm.Click += ButtonPm_OnClick;
|
_buttonPm.Click += ButtonPm_OnClick;
|
||||||
_buttonConfirm.Click += ButtonConfirm_OnClick;
|
ButtonConfirm.Click += ButtonConfirm_OnClick;
|
||||||
_borderTitle.MouseWheel += BorderTitle_OnMouseWheel;
|
_borderTitle.MouseWheel += BorderTitle_OnMouseWheel;
|
||||||
|
|
||||||
_canvas.MouseWheel += Canvas_OnMouseWheel;
|
_canvas.MouseWheel += Canvas_OnMouseWheel;
|
||||||
@@ -241,7 +161,7 @@ namespace HandyControl.Controls
|
|||||||
_circlePanel.Children.Add(button);
|
_circlePanel.Children.Add(button);
|
||||||
}
|
}
|
||||||
|
|
||||||
_appliedTemplate = true;
|
AppliedTemplate = true;
|
||||||
if (SelectedTime.HasValue)
|
if (SelectedTime.HasValue)
|
||||||
{
|
{
|
||||||
Update(SelectedTime.Value);
|
Update(SelectedTime.Value);
|
||||||
@@ -255,26 +175,15 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
#endregion Public Methods
|
#endregion Public Methods
|
||||||
|
|
||||||
#region Protected Methods
|
|
||||||
|
|
||||||
protected virtual void OnSelectedTimeChanged(FunctionEventArgs<DateTime?> e) => RaiseEvent(e);
|
|
||||||
|
|
||||||
protected virtual void OnDisplayTimeChanged(FunctionEventArgs<DateTime> e)
|
|
||||||
{
|
|
||||||
var handler = DisplayTimeChanged;
|
|
||||||
handler?.Invoke(this, e);
|
|
||||||
}
|
|
||||||
|
|
||||||
#endregion Protected Methods
|
|
||||||
|
|
||||||
#region Private Methods
|
#region Private Methods
|
||||||
|
|
||||||
private void CheckNull()
|
private bool CheckNull()
|
||||||
{
|
{
|
||||||
|
if (_buttonPm == null || _buttonAm == null || ButtonConfirm == null || _canvas == null ||
|
||||||
if (_buttonPm == null || _buttonAm == null || _buttonConfirm == null || _canvas == null ||
|
|
||||||
_borderTitle == null || _borderClock == null || _circlePanel == null ||
|
_borderTitle == null || _borderClock == null || _circlePanel == null ||
|
||||||
_blockTime == null) throw new Exception();
|
_blockTime == null) return false;
|
||||||
|
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void BorderTitle_OnMouseWheel(object sender, MouseWheelEventArgs e)
|
private void BorderTitle_OnMouseWheel(object sender, MouseWheelEventArgs e)
|
||||||
@@ -339,7 +248,7 @@ namespace HandyControl.Controls
|
|||||||
|
|
||||||
private void Update()
|
private void Update()
|
||||||
{
|
{
|
||||||
if (!_appliedTemplate) return;
|
if (!AppliedTemplate) return;
|
||||||
var hValue = _currentButton.Num;
|
var hValue = _currentButton.Num;
|
||||||
if (_buttonPm.IsChecked == true)
|
if (_buttonPm.IsChecked == true)
|
||||||
{
|
{
|
||||||
@@ -367,9 +276,9 @@ namespace HandyControl.Controls
|
|||||||
/// 更新
|
/// 更新
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="time"></param>
|
/// <param name="time"></param>
|
||||||
internal void Update(DateTime time)
|
internal override void Update(DateTime time)
|
||||||
{
|
{
|
||||||
if (!_appliedTemplate) return;
|
if (!AppliedTemplate) return;
|
||||||
var h = time.Hour;
|
var h = time.Hour;
|
||||||
var m = time.Minute;
|
var m = time.Minute;
|
||||||
|
|
||||||
@@ -396,12 +305,6 @@ namespace HandyControl.Controls
|
|||||||
Update();
|
Update();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void ButtonConfirm_OnClick(object sender, RoutedEventArgs e)
|
|
||||||
{
|
|
||||||
SelectedTime = DisplayTime;
|
|
||||||
Confirmed?.Invoke();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取显示时间
|
/// 获取显示时间
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -0,0 +1,106 @@
|
|||||||
|
using System;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
using HandyControl.Data;
|
||||||
|
|
||||||
|
namespace HandyControl.Controls
|
||||||
|
{
|
||||||
|
[TemplatePart(Name = ElementButtonConfirm, Type = typeof(Button))]
|
||||||
|
public abstract class ClockBase : Control
|
||||||
|
{
|
||||||
|
protected const string ElementButtonConfirm = "PART_ButtonConfirm";
|
||||||
|
|
||||||
|
protected Button ButtonConfirm;
|
||||||
|
|
||||||
|
protected bool AppliedTemplate;
|
||||||
|
|
||||||
|
public event Action Confirmed;
|
||||||
|
|
||||||
|
public event EventHandler<FunctionEventArgs<DateTime>> DisplayTimeChanged;
|
||||||
|
|
||||||
|
public static readonly RoutedEvent SelectedTimeChangedEvent =
|
||||||
|
EventManager.RegisterRoutedEvent("SelectedTimeChanged", RoutingStrategy.Direct,
|
||||||
|
typeof(EventHandler<FunctionEventArgs<DateTime?>>), typeof(ClockBase));
|
||||||
|
|
||||||
|
public event EventHandler<FunctionEventArgs<DateTime?>> SelectedTimeChanged
|
||||||
|
{
|
||||||
|
add => AddHandler(SelectedTimeChangedEvent, value);
|
||||||
|
remove => RemoveHandler(SelectedTimeChangedEvent, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty TimeFormatProperty = DependencyProperty.Register(
|
||||||
|
"TimeFormat", typeof(string), typeof(ClockBase), new PropertyMetadata("HH:mm:ss"));
|
||||||
|
|
||||||
|
public string TimeFormat
|
||||||
|
{
|
||||||
|
get => (string)GetValue(TimeFormatProperty);
|
||||||
|
set => SetValue(TimeFormatProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty SelectedTimeProperty = DependencyProperty.Register(
|
||||||
|
"SelectedTime", typeof(DateTime?), typeof(ClockBase), new PropertyMetadata(default(DateTime?), OnSelectedTimeChanged));
|
||||||
|
|
||||||
|
private static void OnSelectedTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||||
|
{
|
||||||
|
var ctl = (ClockBase)d;
|
||||||
|
var v = (DateTime?)e.NewValue;
|
||||||
|
ctl.DisplayTime = v ?? DateTime.Now;
|
||||||
|
ctl.OnSelectedTimeChanged(new FunctionEventArgs<DateTime?>(SelectedTimeChangedEvent, ctl)
|
||||||
|
{
|
||||||
|
Info = v
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public DateTime? SelectedTime
|
||||||
|
{
|
||||||
|
get => (DateTime?) GetValue(SelectedTimeProperty);
|
||||||
|
set => SetValue(SelectedTimeProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static readonly DependencyProperty DisplayTimeProperty = DependencyProperty.Register(
|
||||||
|
"DisplayTime", typeof(DateTime), typeof(ClockBase),
|
||||||
|
new FrameworkPropertyMetadata(DateTime.Now, FrameworkPropertyMetadataOptions.BindsTwoWayByDefault,
|
||||||
|
OnDisplayTimeChanged));
|
||||||
|
|
||||||
|
private static void OnDisplayTimeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||||
|
{
|
||||||
|
var ctl = (ClockBase)d;
|
||||||
|
var v = (DateTime)e.NewValue;
|
||||||
|
ctl.Update(v);
|
||||||
|
ctl.OnDisplayTimeChanged(new FunctionEventArgs<DateTime>(v));
|
||||||
|
}
|
||||||
|
|
||||||
|
public DateTime DisplayTime
|
||||||
|
{
|
||||||
|
get => (DateTime)GetValue(DisplayTimeProperty);
|
||||||
|
set => SetValue(DisplayTimeProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
internal static readonly DependencyProperty ShowConfirmButtonProperty = DependencyProperty.Register(
|
||||||
|
"ShowConfirmButton", typeof(bool), typeof(ClockBase), new PropertyMetadata(ValueBoxes.FalseBox));
|
||||||
|
|
||||||
|
internal bool ShowConfirmButton
|
||||||
|
{
|
||||||
|
get => (bool) GetValue(ShowConfirmButtonProperty);
|
||||||
|
set => SetValue(ShowConfirmButtonProperty, value);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected virtual void OnSelectedTimeChanged(FunctionEventArgs<DateTime?> e) => RaiseEvent(e);
|
||||||
|
|
||||||
|
protected virtual void OnDisplayTimeChanged(FunctionEventArgs<DateTime> e)
|
||||||
|
{
|
||||||
|
var handler = DisplayTimeChanged;
|
||||||
|
handler?.Invoke(this, e);
|
||||||
|
}
|
||||||
|
|
||||||
|
protected void ButtonConfirm_OnClick(object sender, RoutedEventArgs e)
|
||||||
|
{
|
||||||
|
SelectedTime = DisplayTime;
|
||||||
|
Confirmed?.Invoke();
|
||||||
|
}
|
||||||
|
|
||||||
|
internal abstract void Update(DateTime time);
|
||||||
|
|
||||||
|
protected void Clock_SelectedTimeChanged(object sender, FunctionEventArgs<DateTime?> e) => SelectedTime = e.Info;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,148 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Windows;
|
||||||
|
using System.Windows.Controls;
|
||||||
|
|
||||||
|
namespace HandyControl.Controls
|
||||||
|
{
|
||||||
|
[TemplatePart(Name = ElementHourList, Type = typeof(ListBox))]
|
||||||
|
[TemplatePart(Name = ElementMinuteList, Type = typeof(ListBox))]
|
||||||
|
[TemplatePart(Name = ElementSecondList, Type = typeof(ListBox))]
|
||||||
|
public class ListClock : ClockBase
|
||||||
|
{
|
||||||
|
#region Constants
|
||||||
|
|
||||||
|
private const string ElementHourList = "PART_HourList";
|
||||||
|
private const string ElementMinuteList = "PART_MinuteList";
|
||||||
|
private const string ElementSecondList = "PART_SecondList";
|
||||||
|
|
||||||
|
#endregion Constants
|
||||||
|
|
||||||
|
#region Data
|
||||||
|
|
||||||
|
private ListBox _hourList;
|
||||||
|
|
||||||
|
private ListBox _minuteList;
|
||||||
|
|
||||||
|
private ListBox _secondList;
|
||||||
|
|
||||||
|
#endregion Data
|
||||||
|
|
||||||
|
public override void OnApplyTemplate()
|
||||||
|
{
|
||||||
|
AppliedTemplate = false;
|
||||||
|
if (ButtonConfirm != null)
|
||||||
|
{
|
||||||
|
ButtonConfirm.Click -= ButtonConfirm_OnClick;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_hourList != null)
|
||||||
|
{
|
||||||
|
_hourList.SelectionChanged -= HourList_SelectionChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_minuteList != null)
|
||||||
|
{
|
||||||
|
_minuteList.SelectionChanged -= MinuteList_SelectionChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (_secondList != null)
|
||||||
|
{
|
||||||
|
_secondList.SelectionChanged -= SecondList_SelectionChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
base.OnApplyTemplate();
|
||||||
|
|
||||||
|
_hourList = GetTemplateChild(ElementHourList) as ListBox;
|
||||||
|
if (_hourList != null)
|
||||||
|
{
|
||||||
|
CreateItemsSource(_hourList, 24);
|
||||||
|
_hourList.SelectionChanged += HourList_SelectionChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
_minuteList = GetTemplateChild(ElementMinuteList) as ListBox;
|
||||||
|
if (_minuteList != null)
|
||||||
|
{
|
||||||
|
CreateItemsSource(_minuteList, 60);
|
||||||
|
_minuteList.SelectionChanged += MinuteList_SelectionChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
_secondList = GetTemplateChild(ElementSecondList) as ListBox;
|
||||||
|
if (_secondList != null)
|
||||||
|
{
|
||||||
|
CreateItemsSource(_secondList, 60);
|
||||||
|
_secondList.SelectionChanged += SecondList_SelectionChanged;
|
||||||
|
}
|
||||||
|
|
||||||
|
ButtonConfirm = GetTemplateChild(ElementButtonConfirm) as Button;
|
||||||
|
|
||||||
|
if (ButtonConfirm != null)
|
||||||
|
{
|
||||||
|
ButtonConfirm.Click += ButtonConfirm_OnClick;
|
||||||
|
}
|
||||||
|
|
||||||
|
AppliedTemplate = true;
|
||||||
|
if (SelectedTime.HasValue)
|
||||||
|
{
|
||||||
|
Update(SelectedTime.Value);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
DisplayTime = DateTime.Now;
|
||||||
|
Update(DisplayTime);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void HourList_SelectionChanged(object sender, SelectionChangedEventArgs e) => Update();
|
||||||
|
|
||||||
|
private void MinuteList_SelectionChanged(object sender, SelectionChangedEventArgs e) => Update();
|
||||||
|
|
||||||
|
private void SecondList_SelectionChanged(object sender, SelectionChangedEventArgs e) => Update();
|
||||||
|
|
||||||
|
private void CreateItemsSource(ItemsControl selector, int count)
|
||||||
|
{
|
||||||
|
var list = new List<string>();
|
||||||
|
for (int i = 0; i < count; i++)
|
||||||
|
{
|
||||||
|
list.Add(i.ToString("#00"));
|
||||||
|
}
|
||||||
|
|
||||||
|
selector.ItemsSource = list;
|
||||||
|
}
|
||||||
|
|
||||||
|
private void Update()
|
||||||
|
{
|
||||||
|
if (_hourList.SelectedIndex >= 0 && _hourList.SelectedIndex < 24 &&
|
||||||
|
_minuteList.SelectedIndex >= 0 && _minuteList.SelectedIndex < 60 &&
|
||||||
|
_secondList.SelectedIndex >= 0 && _secondList.SelectedIndex < 60)
|
||||||
|
{
|
||||||
|
var now = DateTime.Now;
|
||||||
|
DisplayTime = new DateTime(now.Year, now.Month, now.Day, _hourList.SelectedIndex,
|
||||||
|
_minuteList.SelectedIndex, _secondList.SelectedIndex);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 更新
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="time"></param>
|
||||||
|
internal override void Update(DateTime time)
|
||||||
|
{
|
||||||
|
if (!AppliedTemplate) return;
|
||||||
|
|
||||||
|
var h = time.Hour;
|
||||||
|
var m = time.Minute;
|
||||||
|
var s = time.Second;
|
||||||
|
|
||||||
|
_hourList.SelectedIndex = h;
|
||||||
|
_minuteList.SelectedIndex = m;
|
||||||
|
_secondList.SelectedIndex = s;
|
||||||
|
|
||||||
|
_hourList.ScrollIntoView(_hourList.SelectedItem);
|
||||||
|
_minuteList.ScrollIntoView(_minuteList.SelectedItem);
|
||||||
|
_secondList.ScrollIntoView(_secondList.SelectedItem);
|
||||||
|
|
||||||
|
DisplayTime = time;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using HandyControl.Controls;
|
using HandyControl.Controls;
|
||||||
|
using HandyControl.Tools;
|
||||||
|
|
||||||
namespace HandyControl.Data
|
namespace HandyControl.Data
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -95,7 +95,9 @@
|
|||||||
<Compile Include="$(MSBuildThisFileDirectory)Controls\Text\Tag\TagPanel.cs" />
|
<Compile Include="$(MSBuildThisFileDirectory)Controls\Text\Tag\TagPanel.cs" />
|
||||||
<Compile Include="$(MSBuildThisFileDirectory)Controls\Time\CalendarWithClock.cs" />
|
<Compile Include="$(MSBuildThisFileDirectory)Controls\Time\CalendarWithClock.cs" />
|
||||||
<Compile Include="$(MSBuildThisFileDirectory)Controls\Time\Clock\Clock.cs" />
|
<Compile Include="$(MSBuildThisFileDirectory)Controls\Time\Clock\Clock.cs" />
|
||||||
|
<Compile Include="$(MSBuildThisFileDirectory)Controls\Time\Clock\ListClock.cs" />
|
||||||
<Compile Include="$(MSBuildThisFileDirectory)Controls\Time\Clock\ClockRadioButton.cs" />
|
<Compile Include="$(MSBuildThisFileDirectory)Controls\Time\Clock\ClockRadioButton.cs" />
|
||||||
|
<Compile Include="$(MSBuildThisFileDirectory)Controls\Time\Clock\ClockBase.cs" />
|
||||||
<Compile Include="$(MSBuildThisFileDirectory)Controls\Time\FlipClock\FlipClock.cs" />
|
<Compile Include="$(MSBuildThisFileDirectory)Controls\Time\FlipClock\FlipClock.cs" />
|
||||||
<Compile Include="$(MSBuildThisFileDirectory)Controls\Time\FlipClock\FlipNumber.cs" />
|
<Compile Include="$(MSBuildThisFileDirectory)Controls\Time\FlipClock\FlipNumber.cs" />
|
||||||
<Compile Include="$(MSBuildThisFileDirectory)Controls\Time\TimeBar\SpeTextBlock.cs" />
|
<Compile Include="$(MSBuildThisFileDirectory)Controls\Time\TimeBar\SpeTextBlock.cs" />
|
||||||
|
|||||||
@@ -6,6 +6,7 @@
|
|||||||
<ResourceDictionary.MergedDictionaries>
|
<ResourceDictionary.MergedDictionaries>
|
||||||
<ResourceDictionary Source="../Basic/Converters.xaml"/>
|
<ResourceDictionary Source="../Basic/Converters.xaml"/>
|
||||||
<ResourceDictionary Source="Button.xaml"/>
|
<ResourceDictionary Source="Button.xaml"/>
|
||||||
|
<ResourceDictionary Source="Base/ListBoxBaseStyle.xaml"/>
|
||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
|
||||||
<Style x:Key="ClockRadioButtonStyle" TargetType="controls:ClockRadioButton">
|
<Style x:Key="ClockRadioButtonStyle" TargetType="controls:ClockRadioButton">
|
||||||
@@ -94,7 +95,7 @@
|
|||||||
</Canvas>
|
</Canvas>
|
||||||
<controls:ClockRadioButton Background="{DynamicResource PrimaryBrush}" Grid.Column="0" x:Name="PART_ButtonAm" IsChecked="True" Height="30" Width="30" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="16,0,0,16" Content="{x:Static langs:Lang.Am}" Style="{StaticResource ClockRadioButtonStyle}"/>
|
<controls:ClockRadioButton Background="{DynamicResource PrimaryBrush}" Grid.Column="0" x:Name="PART_ButtonAm" IsChecked="True" Height="30" Width="30" HorizontalAlignment="Left" VerticalAlignment="Bottom" Margin="16,0,0,16" Content="{x:Static langs:Lang.Am}" Style="{StaticResource ClockRadioButtonStyle}"/>
|
||||||
<controls:ClockRadioButton Background="{DynamicResource PrimaryBrush}" Grid.Column="2" x:Name="PART_ButtonPm" Height="30" Width="30" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,16" Content="{x:Static langs:Lang.Pm}" Style="{StaticResource ClockRadioButtonStyle}"/>
|
<controls:ClockRadioButton Background="{DynamicResource PrimaryBrush}" Grid.Column="2" x:Name="PART_ButtonPm" Height="30" Width="30" HorizontalAlignment="Right" VerticalAlignment="Bottom" Margin="0,0,16,16" Content="{x:Static langs:Lang.Pm}" Style="{StaticResource ClockRadioButtonStyle}"/>
|
||||||
<Button Grid.Column="1" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm" Content="{x:Static langs:Lang.Confirm}" Foreground="{DynamicResource PrimaryBrush}" HorizontalAlignment="Center" Margin="0,0,0,19" Height="24" Width="60" VerticalAlignment="Bottom" Background="Transparent" Style="{StaticResource ButtonCustom}"/>
|
<Button Grid.Column="1" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm" Content="{x:Static langs:Lang.Confirm}" Foreground="{DynamicResource PrimaryBrush}" HorizontalAlignment="Center" Margin="0,0,0,19" Height="24" Width="60" VerticalAlignment="Bottom" Background="Transparent" Style="{StaticResource ButtonCustom}"/>
|
||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
</Grid>
|
</Grid>
|
||||||
@@ -103,5 +104,75 @@
|
|||||||
</Setter.Value>
|
</Setter.Value>
|
||||||
</Setter>
|
</Setter>
|
||||||
</Style>
|
</Style>
|
||||||
|
|
||||||
|
<Style x:Key="ClockListBoxItemStyle" TargetType="ListBoxItem" BasedOn="{StaticResource ListBoxItemBaseStyle}">
|
||||||
|
<Style.Triggers>
|
||||||
|
<Trigger Property="IsMouseOver" Value="true">
|
||||||
|
<Setter Property="Background" Value="{DynamicResource SecondaryRegionBrush}"/>
|
||||||
|
</Trigger>
|
||||||
|
<Trigger Property="IsSelected" Value="true">
|
||||||
|
<Setter Property="Background" Value="{DynamicResource PrimaryBrush}"/>
|
||||||
|
<Setter Property="Foreground" Value="{DynamicResource TextIconBrush}"/>
|
||||||
|
</Trigger>
|
||||||
|
<Trigger Property="IsEnabled" Value="false">
|
||||||
|
<Setter Property="Opacity" Value=".4"/>
|
||||||
|
</Trigger>
|
||||||
|
<Trigger Property="controls:EdgeElement.ShowEdgeContent" Value="true">
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="ListBoxItem">
|
||||||
|
<Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" Background="{TemplateBinding Background}" Padding="{TemplateBinding Padding}" SnapsToDevicePixels="true">
|
||||||
|
<StackPanel Orientation="Horizontal">
|
||||||
|
<ContentControl Width="16" Height="16" Content="{Binding Path=(controls:EdgeElement.LeftContent),RelativeSource={RelativeSource TemplatedParent}}"/>
|
||||||
|
<ContentPresenter Margin="6,0,0,0" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
|
||||||
|
</StackPanel>
|
||||||
|
</Border>
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
</Trigger>
|
||||||
|
</Style.Triggers>
|
||||||
|
</Style>
|
||||||
|
|
||||||
|
<Style x:Key="ClockListBoxStyle" TargetType="ListBox" BasedOn="{StaticResource ListBoxBaseStyle}">
|
||||||
|
<Setter Property="MaxHeight" Value="192"/>
|
||||||
|
<Setter Property="ScrollViewer.CanContentScroll" Value="True"/>
|
||||||
|
<Setter Property="BorderThickness" Value="0,0,0,1"/>
|
||||||
|
<Setter Property="ItemContainerStyle" Value="{StaticResource ClockListBoxItemStyle}"/>
|
||||||
|
</Style>
|
||||||
|
|
||||||
|
<Style TargetType="controls:ListClock">
|
||||||
|
<Setter Property="BorderThickness" Value="1"/>
|
||||||
|
<Setter Property="FocusVisualStyle" Value="{x:Null}"/>
|
||||||
|
<Setter Property="BorderBrush" Value="{DynamicResource BorderBrush}"/>
|
||||||
|
<Setter Property="Width" Value="210"/>
|
||||||
|
<Setter Property="VerticalAlignment" Value="Top"/>
|
||||||
|
<Setter Property="HorizontalAlignment" Value="Left"/>
|
||||||
|
<Setter Property="Background" Value="{DynamicResource RegionBrush}"/>
|
||||||
|
<Setter Property="controls:TitleElement.Background" Value="{DynamicResource TitleBrush}"/>
|
||||||
|
<Setter Property="Template">
|
||||||
|
<Setter.Value>
|
||||||
|
<ControlTemplate TargetType="controls:ListClock">
|
||||||
|
<Border BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Background="{TemplateBinding Background}">
|
||||||
|
<Grid>
|
||||||
|
<Grid.ColumnDefinitions>
|
||||||
|
<ColumnDefinition/>
|
||||||
|
<ColumnDefinition/>
|
||||||
|
<ColumnDefinition/>
|
||||||
|
</Grid.ColumnDefinitions>
|
||||||
|
<Grid.RowDefinitions>
|
||||||
|
<RowDefinition/>
|
||||||
|
<RowDefinition Height="Auto"/>
|
||||||
|
</Grid.RowDefinitions>
|
||||||
|
<ListBox x:Name="PART_HourList" Style="{StaticResource ClockListBoxStyle}"/>
|
||||||
|
<ListBox Grid.Row="0" Grid.Column="1" x:Name="PART_MinuteList" Style="{StaticResource ClockListBoxStyle}" BorderThickness="1,0,1,1"/>
|
||||||
|
<ListBox Grid.Row="0" Grid.Column="2" x:Name="PART_SecondList" Style="{StaticResource ClockListBoxStyle}"/>
|
||||||
|
<Button Margin="0,10" Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="1" Visibility="{TemplateBinding ShowConfirmButton,Converter={StaticResource Boolean2VisibilityConverter}}" Name="PART_ButtonConfirm" Content="{x:Static langs:Lang.Confirm}" Foreground="{DynamicResource PrimaryBrush}" HorizontalAlignment="Center" Background="Transparent" Style="{StaticResource ButtonCustom}"/>
|
||||||
|
</Grid>
|
||||||
|
</Border>
|
||||||
|
</ControlTemplate>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
|
</Style>
|
||||||
|
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
@@ -4,8 +4,9 @@ using System.Diagnostics.CodeAnalysis;
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using HandyControl.Controls;
|
using HandyControl.Controls;
|
||||||
|
using HandyControl.Data;
|
||||||
|
|
||||||
namespace HandyControl.Data
|
namespace HandyControl.Tools
|
||||||
{
|
{
|
||||||
internal class ImageAnimator
|
internal class ImageAnimator
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user