Merge branch 'master' into pr/84
This commit is contained in:
commit
6d4cbbb7d2
31 files changed
+726
-187
No files matched your search
@@ -4,6 +4,9 @@
|
||||
xmlns:controls="clr-namespace:HandyControl.Controls;assembly=HandyControl"
|
||||
Background="{DynamicResource RegionBrush}">
|
||||
<controls:TransitioningContentControl>
|
||||
<controls:Clock Margin="32"/>
|
||||
<StackPanel Orientation="Horizontal" Margin="32">
|
||||
<controls:Clock/>
|
||||
<controls:ListClock Margin="16,0,0,0"/>
|
||||
</StackPanel>
|
||||
</controls:TransitioningContentControl>
|
||||
</UserControl>
|
||||
@@ -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"/>
|
||||
</StackPanel>
|
||||
<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 ShowClearButton="True" Style="{StaticResource TimePickerPlus}" controls:InfoElement.Title="{x:Static langs:Lang.TitleDemoStr1}" Margin="0,32,0,0"/>
|
||||
|
||||
Reference in new issue
Block a user