提交记录修改UI/Controls/Button/IconButton.cs+3 −3看文件
修改UI/Themes/Button/IconButton.xaml+3 −1看文件
| @@ -12,14 +12,14 @@ namespace UI.Controls.Button | ||
| 12 | 12 | { |
| 13 | 13 | public class IconButton : Control |
| 14 | 14 | { |
| 15 | 删除: public Command Command | |
| 15 | 新增: public ICommand Command | |
| 16 | 16 | { |
| 17 | 删除: get { return (Command)GetValue(CommandProperty); } | |
| 17 | 新增: get { return (ICommand)GetValue(CommandProperty); } | |
| 18 | 18 | set { SetValue(CommandProperty, value); } |
| 19 | 19 | } |
| 20 | 20 | public static readonly DependencyProperty CommandProperty = |
| 21 | 21 | DependencyProperty.Register("Command", |
| 22 | 删除: typeof(Command), | |
| 22 | 新增: typeof(ICommand), | |
| 23 | 23 | typeof(IconButton)); |
| 24 | 24 | public IconTypes Icon |
| 25 | 25 | { |
| @@ -8,6 +8,8 @@ | ||
| 8 | 8 | Value="true" /> |
| 9 | 9 | <Setter Property="Width" Value="35"/> |
| 10 | 10 | <Setter Property="Height" Value="35"/> |
| 11 | 新增: <Setter Property="FontSize" Value="16"/> | |
| 12 | 新增: | |
| 11 | 13 | <Setter Property="Background" Value="Transparent"/> |
| 12 | 14 | <Setter Property="Template"> |
| 13 | 15 | <Setter.Value> |
| @@ -15,7 +17,7 @@ | ||
| 15 | 17 | <Border Background="{TemplateBinding Background}" x:Name="Border"> |
| 16 | 18 | |
| 17 | 19 | <Border Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" x:Name="BoxBorder" CornerRadius="4" Padding="5" Background="Transparent"> |
| 18 | 删除: <base:Icon x:Name="Icon" IconType="{TemplateBinding Icon}" Foreground="#5c5c5c" VerticalAlignment="Center" FontSize="16" > | |
| 20 | 新增: <base:Icon x:Name="Icon" IconType="{TemplateBinding Icon}" Foreground="#5c5c5c" VerticalAlignment="Center" FontSize="{TemplateBinding FontSize}" > | |
| 19 | 21 | |
| 20 | 22 | </base:Icon> |
| 21 | 23 | </Border> |

