提交记录修改UI/Themes/Button/Button.xaml+26 −18看文件
修改UI/Themes/Select/DateSelect.xaml+6 −3看文件
修改UI/Themes/Select/Select.xaml+9 −5看文件
| @@ -15,28 +15,37 @@ | ||
| 15 | 15 | <Setter.Value> |
| 16 | 16 | <ControlTemplate TargetType="{x:Type local:Button}"> |
| 17 | 17 | <Border x:Name="Border" SnapsToDevicePixels="True"> |
| 18 | 新增: <Grid> | |
| 18 | 19 | |
| 19 | 删除: <Border BorderBrush="#f3f3f3" BorderThickness="1" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" x:Name="BoxBorder" CornerRadius="4" Background="{TemplateBinding Background}"> | |
| 20 | 删除: <Border.Effect> | |
| 20 | 新增: | |
| 21 | 新增: <Border BorderBrush="#f3f3f3" BorderThickness="1" Width="{TemplateBinding Width}" Height="{TemplateBinding Height}" x:Name="BoxBorder" CornerRadius="4" Background="{TemplateBinding Background}"> | |
| 22 | 新增: <!--<Border.Effect> | |
| 21 | 23 | <DropShadowEffect BlurRadius="5" ShadowDepth="2" Direction="315" Color="Gray" Opacity=".1"/> |
| 22 | 删除: </Border.Effect> | |
| 23 | 删除: <Grid HorizontalAlignment="Center" VerticalAlignment="Center"> | |
| 24 | 删除: <Grid.ColumnDefinitions> | |
| 25 | 删除: <ColumnDefinition Width="auto"/> | |
| 26 | 删除: <ColumnDefinition Width="auto"/> | |
| 27 | 删除: </Grid.ColumnDefinitions> | |
| 28 | 删除: <base:Icon x:Name="Icon" Margin="0,0,5,0" IconType="{TemplateBinding Icon}" VerticalAlignment="Center" FontSize="12" > | |
| 24 | 新增: </Border.Effect>--> | |
| 25 | 新增: <Grid HorizontalAlignment="Center" VerticalAlignment="Center"> | |
| 26 | 新增: <Grid.ColumnDefinitions> | |
| 27 | 新增: <ColumnDefinition Width="auto"/> | |
| 28 | 新增: <ColumnDefinition Width="auto"/> | |
| 29 | 新增: </Grid.ColumnDefinitions> | |
| 30 | 新增: <base:Icon x:Name="Icon" Margin="0,0,5,0" IconType="{TemplateBinding Icon}" VerticalAlignment="Center" FontSize="12" > | |
| 29 | 31 | |
| 30 | 删除: </base:Icon> | |
| 31 | 删除: <ContentPresenter | |
| 32 | 新增: </base:Icon> | |
| 33 | 新增: <ContentPresenter | |
| 32 | 34 | Grid.Column="1" |
| 33 | 35 | HorizontalAlignment="Center" |
| 34 | 36 | VerticalAlignment="Center" |
| 35 | 37 | RecognizesAccessKey="True"/> |
| 36 | 删除: </Grid> | |
| 38 | 新增: </Grid> | |
| 37 | 39 | |
| 38 | 删除: </Border> | |
| 40 | 新增: </Border> | |
| 41 | 新增: <Border x:Name="Shadow" BorderBrush="{Binding ElementName=BoxBorder,Path=BorderBrush}" BorderThickness="{Binding ElementName=BoxBorder,Path=BorderThickness}" Panel.ZIndex="-1" Width="{Binding ElementName=BoxBorder,Path=ActualWidth}" Height="{Binding ElementName=BoxBorder,Path=ActualHeight}" CornerRadius="{Binding ElementName=BoxBorder,Path=CornerRadius}" Background="{Binding ElementName=BoxBorder,Path=Background}"> | |
| 42 | 新增: <Border.Effect> | |
| 43 | 新增: <DropShadowEffect BlurRadius="5" ShadowDepth="2" Direction="315" Color="Gray" Opacity=".1"/> | |
| 44 | 新增: </Border.Effect> | |
| 45 | 新增: </Border> | |
| 39 | 46 | |
| 47 | 新增: | |
| 48 | 新增: </Grid> | |
| 40 | 49 | <VisualStateManager.VisualStateGroups> |
| 41 | 50 | <VisualStateGroup x:Name="CommonStates"> |
| 42 | 51 | <VisualStateGroup.Transitions> |
| @@ -47,11 +56,11 @@ | ||
| 47 | 56 | <VisualState x:Name="Normal" /> |
| 48 | 57 | <VisualState x:Name="MouseOver"> |
| 49 | 58 | <Storyboard> |
| 50 | 删除: <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.Effect).(DropShadowEffect.Color)" | |
| 51 | 删除: Storyboard.TargetName="BoxBorder"> | |
| 52 | 删除: <EasingColorKeyFrame KeyTime="0" | |
| 59 | 新增: <!--<ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.Effect).(DropShadowEffect.Color)" | |
| 60 | 新增: Storyboard.TargetName="Shadow"> | |
| 61 | 新增: <EasingColorKeyFrame KeyTime="0" | |
| 53 | 62 | Value="#2b20d9" /> |
| 54 | 删除: </ColorAnimationUsingKeyFrames> | |
| 63 | 新增: </ColorAnimationUsingKeyFrames>--> | |
| 55 | 64 | <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" |
| 56 | 65 | Storyboard.TargetName="BoxBorder"> |
| 57 | 66 | <EasingColorKeyFrame KeyTime="0" |
| @@ -82,7 +91,6 @@ | ||
| 82 | 91 | </VisualState> |
| 83 | 92 | </VisualStateGroup> |
| 84 | 93 | </VisualStateManager.VisualStateGroups> |
| 85 | 删除: | |
| 86 | 94 | </Border> |
| 87 | 95 | <ControlTemplate.Triggers> |
| 88 | 96 | <Trigger Property="Icon" Value="None"> |
| @@ -15,13 +15,16 @@ | ||
| 15 | 15 | <Border SnapsToDevicePixels="True" Background="{TemplateBinding Background}" HorizontalAlignment="Left" > |
| 16 | 16 | <Grid> |
| 17 | 17 | <!--当前选择项--> |
| 18 | 新增: <Border Background="{Binding ElementName=Main,Path=Background}" Panel.ZIndex="-1" Width="{Binding ElementName=Main,Path=ActualWidth}" Height="{Binding ElementName=Main,Path=ActualHeight}" CornerRadius="{Binding ElementName=Main,Path=CornerRadius}"> | |
| 19 | 新增: <Border.Effect> | |
| 20 | 新增: <DropShadowEffect Color="#d8d2d2" BlurRadius="1" Direction="300" ShadowDepth="4" Opacity="0.1" RenderingBias="Performance" ></DropShadowEffect> | |
| 21 | 新增: </Border.Effect> | |
| 22 | 新增: </Border> | |
| 18 | 23 | <Border x:Name="Main" Margin="0,0,0,0" Background="White" HorizontalAlignment="Left" Padding="18,10" CornerRadius="5"> |
| 19 | 24 | <Border.InputBindings> |
| 20 | 25 | <MouseBinding Gesture="LeftClick" Command="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:DateSelect}}, Path=ShowSelectCommand}"/> |
| 21 | 26 | </Border.InputBindings> |
| 22 | 删除: <Border.Effect> | |
| 23 | 删除: <DropShadowEffect Color="#d8d2d2" BlurRadius="1" Direction="300" ShadowDepth="4" Opacity="0.1" RenderingBias="Performance" ></DropShadowEffect> | |
| 24 | 删除: </Border.Effect> | |
| 27 | 新增: | |
| 25 | 28 | <StackPanel Orientation="Horizontal"> |
| 26 | 29 | <base:Icon x:Name="Icon" IconType="DateTime"/> |
| 27 | 30 | <TextBlock Foreground="#1a1a1a" Text="{TemplateBinding DateStr}" VerticalAlignment="Center" Margin="5,0,0,0"/> |
| @@ -12,17 +12,21 @@ | ||
| 12 | 12 | <Setter Property="Template"> |
| 13 | 13 | <Setter.Value> |
| 14 | 14 | <ControlTemplate TargetType="{x:Type local:Select}"> |
| 15 | 删除: <Border HorizontalAlignment="Left" SnapsToDevicePixels="True"> | |
| 16 | 删除: <Grid> | |
| 15 | 新增: <Border HorizontalAlignment="Left" > | |
| 16 | 新增: | |
| 17 | 新增: <Grid > | |
| 17 | 18 | <!--当前选择项--> |
| 18 | 删除: <Border x:Name="Main" Background="{TemplateBinding Background}" HorizontalAlignment="Left" Padding="18,10" CornerRadius="5"> | |
| 19 | 新增: <Border Background="{TemplateBinding Background}" Panel.ZIndex="-1" Width="{Binding ElementName=Main,Path=ActualWidth}" Height="{Binding ElementName=Main,Path=ActualHeight}" CornerRadius="{Binding ElementName=Main,Path=CornerRadius}"> | |
| 19 | 20 | <Border.Effect> |
| 20 | 21 | <DropShadowEffect Color="#d8d2d2" BlurRadius="1" Direction="300" ShadowDepth="4" Opacity="0.1" RenderingBias="Performance" ></DropShadowEffect> |
| 21 | 22 | </Border.Effect> |
| 22 | 删除: <StackPanel Orientation="Horizontal"> | |
| 23 | 新增: | |
| 24 | 新增: </Border> | |
| 25 | 新增: <Border x:Name="Main" Background="{TemplateBinding Background}" Padding="18,10" CornerRadius="5"> | |
| 26 | 新增: <StackPanel Orientation="Horizontal" > | |
| 23 | 27 | <!--<TextBlock x:Name="PlaceholderText" Text="请选择" Visibility="Collapsed"/>--> |
| 24 | 28 | <base:Img x:Name="Img" URL="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:Select}}, Path=SelectedItem.Img}" Width="25" Height="25" VerticalAlignment="Center"/> |
| 25 | 删除: <TextBlock Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:Select}}, Path=SelectedItem.Name}" VerticalAlignment="Center" Margin="5,0,0,0"/> | |
| 29 | 新增: <TextBlock TextOptions.TextFormattingMode="Display" Text="{Binding RelativeSource={RelativeSource AncestorType={x:Type local:Select}}, Path=SelectedItem.Name}" VerticalAlignment="Center" Margin="5,0,0,0"/> | |
| 26 | 30 | </StackPanel> |
| 27 | 31 | </Border> |
| 28 | 32 | |

