提交记录修改UI/Resources/Themes/Common.xaml+34 −24看文件
修改UI/Resources/Themes/Dark.xaml+4 −0看文件
修改UI/Resources/Themes/Light.xaml+3 −1看文件
| @@ -445,7 +445,7 @@ HorizontalAlignment="Left" RecognizesAccess | ||
| 445 | 445 | <Grid> |
| 446 | 446 | <Rectangle |
| 447 | 447 | x:Name="Bar" |
| 448 | 删除: Fill="#8a8a8a" | |
| 448 | 新增: Fill="{DynamicResource ScrollBarBrush}" | |
| 449 | 449 | RadiusX="4" |
| 450 | 450 | RadiusY="4"/> |
| 451 | 451 | </Grid> |
| @@ -589,6 +589,7 @@ HorizontalAlignment="Left" RecognizesAccess | ||
| 589 | 589 | <!-- ScrollViewer --> |
| 590 | 590 | <Style |
| 591 | 591 | TargetType="{x:Type ScrollViewer}"> |
| 592 | 新增: <Setter Property="Background" Value="Transparent"/> | |
| 592 | 593 | <Setter Property="OverridesDefaultStyle" |
| 593 | 594 | Value="True" /> |
| 594 | 595 | <Setter Property="Template"> |
| @@ -618,8 +619,10 @@ HorizontalAlignment="Left" RecognizesAccess | ||
| 618 | 619 | ContentTemplate="{TemplateBinding ContentTemplate}"/> |
| 619 | 620 | <ScrollBar x:Name="PART_VerticalScrollBar" |
| 620 | 621 | HorizontalAlignment="Right" |
| 622 | 新增: Margin="0,0,3,0" | |
| 621 | 623 | Maximum="{TemplateBinding ScrollableHeight}" |
| 622 | 624 | Opacity="0" |
| 625 | 新增: Width="2" | |
| 623 | 626 | Orientation="Vertical" |
| 624 | 627 | ScrollViewer.IsDeferredScrollingEnabled="True" |
| 625 | 628 | ViewportSize="{TemplateBinding ViewportHeight}" |
| @@ -636,30 +639,48 @@ HorizontalAlignment="Left" RecognizesAccess | ||
| 636 | 639 | </Grid> |
| 637 | 640 | </Border> |
| 638 | 641 | <ControlTemplate.Triggers> |
| 639 | 删除: <Trigger Property="IsMouseOver" Value="True"> | |
| 640 | 删除: <Setter TargetName="PART_VerticalScrollBar" Property="Opacity" Value=".5" /> | |
| 642 | 新增: <DataTrigger Binding="{Binding RelativeSource={RelativeSource Self}, Path=IsMouseOver}" Value="True"> | |
| 643 | 新增: <DataTrigger.EnterActions> | |
| 644 | 新增: <BeginStoryboard> | |
| 645 | 新增: <Storyboard> | |
| 646 | 新增: <DoubleAnimation | |
| 647 | 新增: Storyboard.TargetName="PART_VerticalScrollBar" | |
| 648 | 新增: Storyboard.TargetProperty="Opacity" | |
| 649 | 新增: To="1" | |
| 650 | 新增: Duration="0:0:0.3"/> | |
| 651 | 新增: </Storyboard> | |
| 652 | 新增: </BeginStoryboard> | |
| 653 | 新增: </DataTrigger.EnterActions> | |
| 654 | 新增: <DataTrigger.ExitActions> | |
| 655 | 新增: <BeginStoryboard> | |
| 656 | 新增: <Storyboard> | |
| 657 | 新增: <DoubleAnimation | |
| 658 | 新增: Storyboard.TargetName="PART_VerticalScrollBar" | |
| 659 | 新增: Storyboard.TargetProperty="Opacity" | |
| 660 | 新增: To="0" | |
| 661 | 新增: Duration="0:0:0.3"/> | |
| 662 | 新增: </Storyboard> | |
| 663 | 新增: </BeginStoryboard> | |
| 664 | 新增: </DataTrigger.ExitActions> | |
| 665 | 新增: </DataTrigger> | |
| 666 | 新增: <!--<Trigger Property="IsMouseOver" Value="True"> | |
| 667 | 新增: <Setter TargetName="PART_VerticalScrollBar" Property="Opacity" Value="1" /> | |
| 641 | 668 | |
| 642 | 669 | </Trigger> |
| 643 | 670 | <Trigger Property="IsMouseOver" Value="False"> |
| 644 | 671 | <Setter TargetName="PART_VerticalScrollBar" Property="Opacity" Value="0" /> |
| 645 | 672 | |
| 646 | 删除: </Trigger> | |
| 673 | 新增: </Trigger>--> | |
| 647 | 674 | <EventTrigger RoutedEvent="MouseEnter" |
| 648 | 675 | SourceName="PART_VerticalScrollBar"> |
| 649 | 676 | <BeginStoryboard> |
| 650 | 677 | <Storyboard> |
| 651 | 删除: | |
| 678 | 新增: | |
| 652 | 679 | <DoubleAnimation |
| 653 | 删除: Storyboard.TargetName="PART_VerticalScrollBar" | |
| 654 | 删除: Storyboard.TargetProperty="Opacity" | |
| 655 | 删除: To="1" | |
| 656 | 删除: Duration="0:0:0.3"/> | |
| 657 | 删除: | |
| 658 | 删除: <!--<DoubleAnimation | |
| 659 | 680 | Storyboard.TargetName="PART_VerticalScrollBar" |
| 660 | 681 | Storyboard.TargetProperty="Width" |
| 661 | 682 | To="8" |
| 662 | 删除: Duration="0:0:0.1"/>--> | |
| 683 | 新增: Duration="0:0:0.1"/> | |
| 663 | 684 | </Storyboard> |
| 664 | 685 | </BeginStoryboard> |
| 665 | 686 | </EventTrigger> |
| @@ -668,21 +689,10 @@ HorizontalAlignment="Left" RecognizesAccess | ||
| 668 | 689 | <BeginStoryboard> |
| 669 | 690 | <Storyboard> |
| 670 | 691 | <DoubleAnimation |
| 671 | 删除: Storyboard.TargetName="PART_VerticalScrollBar" | |
| 672 | 删除: Storyboard.TargetProperty="Opacity" | |
| 673 | 删除: To=".5" | |
| 674 | 删除: Duration="0:0:0.3"/> | |
| 675 | 删除: <!--<DoubleAnimation | |
| 676 | 删除: Storyboard.TargetName="PART_VerticalScrollBar" | |
| 677 | 删除: Storyboard.TargetProperty="Opacity" | |
| 678 | 删除: To="0.5" | |
| 679 | 删除: Duration="0:0:0.3"/>--> | |
| 680 | 删除: | |
| 681 | 删除: <!--<DoubleAnimation | |
| 682 | 692 | Storyboard.TargetName="PART_VerticalScrollBar" |
| 683 | 693 | Storyboard.TargetProperty="Width" |
| 684 | 694 | To="2" |
| 685 | 删除: Duration="0:0:0.1"/>--> | |
| 695 | 新增: Duration="0:0:0.1"/> | |
| 686 | 696 | </Storyboard> |
| 687 | 697 | </BeginStoryboard> |
| 688 | 698 | </EventTrigger> |
| @@ -121,4 +121,8 @@ | ||
| 121 | 121 | <Color x:Key="DisabledTextColor">#504f4f</Color> |
| 122 | 122 | <SolidColorBrush x:Key="DisabledTextBrush" Color="{StaticResource DisabledTextColor}" /> |
| 123 | 123 | |
| 124 | 新增: <!--滚动条--> | |
| 125 | 新增: <Color x:Key="ScrollBarColor">#a0a0a0</Color> | |
| 126 | 新增: <SolidColorBrush x:Key="ScrollBarBrush" Color="{StaticResource ScrollBarColor}" /> | |
| 127 | 新增: | |
| 124 | 128 | </ResourceDictionary> |
| 文件末尾没有换行 | ||
| @@ -121,5 +121,7 @@ | ||
| 121 | 121 | <!--禁用颜色--> |
| 122 | 122 | <Color x:Key="DisabledTextColor">#ccc</Color> |
| 123 | 123 | <SolidColorBrush x:Key="DisabledTextBrush" Color="{StaticResource DisabledTextColor}" /> |
| 124 | 删除: | |
| 124 | 新增: | |
| 125 | 新增: <Color x:Key="ScrollBarColor">#8A8A8A</Color> | |
| 126 | 新增: <SolidColorBrush x:Key="ScrollBarBrush" Color="{StaticResource ScrollBarColor}" /> | |
| 125 | 127 | </ResourceDictionary> |
| 文件末尾没有换行 | ||

