提交记录修改UI/Controls/Charts/ChartsItemTypeA.cs+11 −0看文件
修改UI/Controls/Charts/ChartsItemTypeCard.cs+11 −0看文件
修改UI/Themes/Charts/ChartsItemTypeA.xaml+30 −0看文件
修改UI/Themes/Charts/ChartsItemTypeCard.xaml+46 −6看文件
| @@ -117,5 +117,16 @@ namespace UI.Controls.Charts | ||
| 117 | 117 | ValueBlockObj.Width = (Data.Value / MaxValue) * (ValueContainer.ActualWidth * 0.95 - ValueTextObj.ActualWidth); |
| 118 | 118 | }; |
| 119 | 119 | } |
| 120 | 新增: | |
| 121 | 新增: protected override void OnMouseEnter(MouseEventArgs e) | |
| 122 | 新增: { | |
| 123 | 新增: base.OnMouseEnter(e); | |
| 124 | 新增: VisualStateManager.GoToState(this, "MouseOver", true); | |
| 125 | 新增: } | |
| 126 | 新增: protected override void OnMouseLeave(MouseEventArgs e) | |
| 127 | 新增: { | |
| 128 | 新增: base.OnMouseLeave(e); | |
| 129 | 新增: VisualStateManager.GoToState(this, "NormalState", true); | |
| 130 | 新增: } | |
| 120 | 131 | } |
| 121 | 132 | } |
| @@ -125,5 +125,16 @@ namespace UI.Controls.Charts | ||
| 125 | 125 | ValueBlockObj.Width = ValueBlockObj.Height = (Data.Value / MaxValue) * ActualWidth; |
| 126 | 126 | }; |
| 127 | 127 | } |
| 128 | 新增: | |
| 129 | 新增: protected override void OnMouseEnter(MouseEventArgs e) | |
| 130 | 新增: { | |
| 131 | 新增: base.OnMouseEnter(e); | |
| 132 | 新增: VisualStateManager.GoToState(this, "MouseOver", true); | |
| 133 | 新增: } | |
| 134 | 新增: protected override void OnMouseLeave(MouseEventArgs e) | |
| 135 | 新增: { | |
| 136 | 新增: base.OnMouseLeave(e); | |
| 137 | 新增: VisualStateManager.GoToState(this, "NormalState", true); | |
| 138 | 新增: } | |
| 128 | 139 | } |
| 129 | 140 | } |
| @@ -72,6 +72,36 @@ | ||
| 72 | 72 | </StackPanel> |
| 73 | 73 | </Grid> |
| 74 | 74 | </Grid> |
| 75 | 新增: <VisualStateManager.VisualStateGroups> | |
| 76 | 新增: <VisualStateGroup x:Name="CommonStates"> | |
| 77 | 新增: <VisualStateGroup.Transitions> | |
| 78 | 新增: <VisualTransition GeneratedDuration="0:0:.3" /> | |
| 79 | 新增: <VisualTransition GeneratedDuration="0" | |
| 80 | 新增: To="Pressed" /> | |
| 81 | 新增: </VisualStateGroup.Transitions> | |
| 82 | 新增: <VisualState x:Name="NormalState" /> | |
| 83 | 新增: <VisualState x:Name="MouseOver"> | |
| 84 | 新增: <Storyboard > | |
| 85 | 新增: <ColorAnimation Storyboard.TargetProperty="(Rectangle.Fill).(SolidColorBrush.Color)" | |
| 86 | 新增: Storyboard.TargetName="ValueBlockObj" To="#2b20d9" > | |
| 87 | 新增: <ColorAnimation.EasingFunction> | |
| 88 | 新增: <CubicEase EasingMode="EaseInOut"/> | |
| 89 | 新增: </ColorAnimation.EasingFunction> | |
| 90 | 新增: </ColorAnimation> | |
| 91 | 新增: <!--<ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" | |
| 92 | 新增: Storyboard.TargetName="Bg" > | |
| 93 | 新增: <EasingColorKeyFrame KeyTime="0" | |
| 94 | 新增: Value="#192B20D9"/> | |
| 95 | 新增: | |
| 96 | 新增: </ColorAnimationUsingKeyFrames>--> | |
| 97 | 新增: | |
| 98 | 新增: </Storyboard> | |
| 99 | 新增: </VisualState> | |
| 100 | 新增: <VisualState x:Name="Pressed"> | |
| 101 | 新增: | |
| 102 | 新增: </VisualState> | |
| 103 | 新增: </VisualStateGroup> | |
| 104 | 新增: </VisualStateManager.VisualStateGroups> | |
| 75 | 105 | </Border> |
| 76 | 106 | |
| 77 | 107 | <ControlTemplate.Triggers> |
| @@ -14,16 +14,18 @@ | ||
| 14 | 14 | <ControlTemplate TargetType="{x:Type local:ChartsItemTypeCard}"> |
| 15 | 15 | <Grid > |
| 16 | 16 | <Grid x:Name="Normal"> |
| 17 | 删除: <Border CornerRadius="12"> | |
| 18 | 删除: <!--<Border.Effect> | |
| 19 | 删除: <DropShadowEffect BlurRadius="14" ShadowDepth="0" Direction="0" Opacity="0.05"/> | |
| 20 | 删除: </Border.Effect>--> | |
| 21 | 删除: <Border Margin="0" Background="White" CornerRadius="12" Width="150" Height="150" > | |
| 17 | 新增: <Border x:Name="ShadowBorder" CornerRadius="12"> | |
| 18 | 新增: <Border.Effect> | |
| 19 | 新增: <DropShadowEffect Color="#2b20d9" BlurRadius="17" Direction="0" ShadowDepth="0" Opacity="0"/> | |
| 20 | 新增: </Border.Effect> | |
| 21 | 新增: <Border x:Name="Border" BorderBrush="Transparent" BorderThickness="2" Margin="0" Background="White" CornerRadius="12" Width="150" Height="150" > | |
| 22 | 22 | |
| 23 | 23 | <Border.Clip> |
| 24 | 24 | <RectangleGeometry RadiusX="12" RadiusY="12" Rect="0,0,150,150"/> |
| 25 | 25 | </Border.Clip> |
| 26 | 删除: | |
| 26 | 新增: <!--<Border.RenderTransform> | |
| 27 | 新增: | |
| 28 | 新增: </Border.RenderTransform>--> | |
| 27 | 29 | <Grid> |
| 28 | 30 | <Rectangle |
| 29 | 31 | x:Name="ValueBlockObj" |
| @@ -66,6 +68,44 @@ | ||
| 66 | 68 | <Grid x:Name="Loading" Visibility="Collapsed"> |
| 67 | 69 | <base:Placeholder CornerRadius="12" Width="150" Height="150"/> |
| 68 | 70 | </Grid> |
| 71 | 新增: | |
| 72 | 新增: <VisualStateManager.VisualStateGroups> | |
| 73 | 新增: <VisualStateGroup x:Name="CommonStates"> | |
| 74 | 新增: <VisualStateGroup.Transitions> | |
| 75 | 新增: <VisualTransition GeneratedDuration="0:0:.3" /> | |
| 76 | 新增: <VisualTransition GeneratedDuration="0" | |
| 77 | 新增: To="Pressed" /> | |
| 78 | 新增: </VisualStateGroup.Transitions> | |
| 79 | 新增: <VisualState x:Name="NormalState" /> | |
| 80 | 新增: <VisualState x:Name="MouseOver"> | |
| 81 | 新增: <Storyboard > | |
| 82 | 新增: <ColorAnimation Storyboard.TargetProperty="(Border.BorderBrush).(SolidColorBrush.Color)" | |
| 83 | 新增: Storyboard.TargetName="Border" To="#2b20d9" > | |
| 84 | 新增: <ColorAnimation.EasingFunction> | |
| 85 | 新增: <CubicEase EasingMode="EaseInOut"/> | |
| 86 | 新增: </ColorAnimation.EasingFunction> | |
| 87 | 新增: </ColorAnimation> | |
| 88 | 新增: | |
| 89 | 新增: <DoubleAnimation Storyboard.TargetProperty="(Border.Effect).(DropShadowEffect.Opacity)" | |
| 90 | 新增: Storyboard.TargetName="ShadowBorder" To="0.3" > | |
| 91 | 新增: <DoubleAnimation.EasingFunction> | |
| 92 | 新增: <CubicEase EasingMode="EaseInOut"/> | |
| 93 | 新增: </DoubleAnimation.EasingFunction> | |
| 94 | 新增: </DoubleAnimation> | |
| 95 | 新增: <!--<ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Border.Background).(SolidColorBrush.Color)" | |
| 96 | 新增: Storyboard.TargetName="Bg" > | |
| 97 | 新增: <EasingColorKeyFrame KeyTime="0" | |
| 98 | 新增: Value="#192B20D9"/> | |
| 99 | 新增: | |
| 100 | 新增: </ColorAnimationUsingKeyFrames>--> | |
| 101 | 新增: | |
| 102 | 新增: </Storyboard> | |
| 103 | 新增: </VisualState> | |
| 104 | 新增: <VisualState x:Name="Pressed"> | |
| 105 | 新增: | |
| 106 | 新增: </VisualState> | |
| 107 | 新增: </VisualStateGroup> | |
| 108 | 新增: </VisualStateManager.VisualStateGroups> | |
| 69 | 109 | </Grid> |
| 70 | 110 | <ControlTemplate.Triggers> |
| 71 | 111 | <Trigger Property="IsLoading" Value="True"> |

