Skip to content

Commit 94778e5

Browse files
zdy1988zdy1988
committed
11
1 parent 1a08e45 commit 94778e5

File tree

3 files changed

+33
-62
lines changed

3 files changed

+33
-62
lines changed

‎src/MainWindow.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
<local:PictureWindow.TitleBarContent>
2525
<DockPanel>
2626
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
27-
<Button x:Name="AboutButton" Style="{StaticResource PictureView.IconButton2}" Click="AboutButton_Click" ToolTip="关于">
27+
<Button x:Name="AboutButton" Style="{StaticResource PictureView.TitleBar.IconButton}" Click="AboutButton_Click" ToolTip="关于">
2828
<Path Data="{StaticResource Icon.About}"/>
2929
</Button>
30-
<Button x:Name="SettingsButton" Style="{StaticResource PictureView.IconButton2}" Click="SettingsButton_Click" ToolTip="设置">
30+
<Button x:Name="SettingsButton" Style="{StaticResource PictureView.TitleBar.IconButton}" Click="SettingsButton_Click" ToolTip="设置">
3131
<Path Data="{StaticResource Icon.Settings}"/>
3232
</Button>
3333
</StackPanel>
@@ -247,11 +247,11 @@
247247
<Border x:Name="PageButton"
248248
Visibility="{Binding CurrentPicture, Converter={StaticResource NullableToVisibilityConverter}}">
249249
<Grid>
250-
<Button Style="{StaticResource PictureView.IconButton4}" Click="PrevButton_Click" ToolTip="上一张"
250+
<Button Style="{StaticResource PictureView.Navigation.IconButton}" Click="PrevButton_Click" ToolTip="上一张"
251251
VerticalAlignment="Center" HorizontalAlignment="Left" Margin="24">
252252
<Path Data="{StaticResource Icon.ChevronLeft}"/>
253253
</Button>
254-
<Button Style="{StaticResource PictureView.IconButton4}" Click="NextButton_Click" ToolTip="下一张"
254+
<Button Style="{StaticResource PictureView.Navigation.IconButton}" Click="NextButton_Click" ToolTip="下一张"
255255
VerticalAlignment="Center" HorizontalAlignment="Right" Margin="24">
256256
<Path Data="{StaticResource Icon.ChevronRight}"/>
257257
</Button>

‎src/Themes/Zhai.PictureView.IconButton.xaml‎

Lines changed: 24 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -33,27 +33,27 @@
3333
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
3434
</Border>
3535
</Grid>
36-
<ControlTemplate.Triggers>
37-
<Trigger Property="IsEnabled" Value="False">
38-
<Setter Property="Opacity" Value=".6"/>
39-
</Trigger>
40-
<Trigger Property="IsMouseOver" Value="True">
41-
<Setter Property="Foreground" Value="{StaticResource PictureView.IconButton.HighlightBrush}"/>
42-
</Trigger>
43-
<Trigger Property="IsPressed" Value="True">
44-
<Setter Property="RenderTransform">
45-
<Setter.Value>
46-
<ScaleTransform CenterX="0.5" CenterY="0.5" ScaleX="0.95" ScaleY="0.95" />
47-
</Setter.Value>
48-
</Setter>
49-
</Trigger>
50-
</ControlTemplate.Triggers>
5136
</ControlTemplate>
5237
</Setter.Value>
5338
</Setter>
39+
<Style.Triggers>
40+
<Trigger Property="IsEnabled" Value="False">
41+
<Setter Property="Opacity" Value=".6"/>
42+
</Trigger>
43+
<Trigger Property="IsMouseOver" Value="True">
44+
<Setter Property="Foreground" Value="{StaticResource PictureView.IconButton.HighlightBrush}"/>
45+
</Trigger>
46+
<Trigger Property="IsPressed" Value="True">
47+
<Setter Property="RenderTransform">
48+
<Setter.Value>
49+
<ScaleTransform CenterX="0.5" CenterY="0.5" ScaleX="0.95" ScaleY="0.95" />
50+
</Setter.Value>
51+
</Setter>
52+
</Trigger>
53+
</Style.Triggers>
5454
</Style>
5555

56-
<Style x:Key="PictureView.IconButton2" TargetType="Button" BasedOn="{StaticResource PictureView.IconButton}">
56+
<Style x:Key="PictureView.TitleBar.IconButton" TargetType="Button" BasedOn="{StaticResource PictureView.IconButton}">
5757
<Setter Property="Template">
5858
<Setter.Value>
5959
<ControlTemplate TargetType="Button">
@@ -73,35 +73,18 @@
7373
</Setter>
7474
</Style>
7575

76-
<Style x:Key="PictureView.IconButton3" TargetType="Button" BasedOn="{StaticResource PictureView.IconButton}">
77-
<Setter Property="Template">
78-
<Setter.Value>
79-
<ControlTemplate TargetType="Button">
80-
<ControlTemplate.Resources>
81-
<Style TargetType="Path" BasedOn="{StaticResource PictureView.IconButton.Path}">
82-
<Setter Property="Width" Value="12"/>
83-
<Setter Property="Height" Value="12"/>
84-
</Style>
85-
</ControlTemplate.Resources>
86-
<Grid>
87-
<Border Background="{TemplateBinding Background}" BorderBrush="{TemplateBinding BorderBrush}" Padding="{TemplateBinding Padding}" BorderThickness="{TemplateBinding BorderThickness}">
88-
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
89-
</Border>
90-
</Grid>
91-
<ControlTemplate.Triggers>
92-
<Trigger Property="IsMouseOver" Value="True">
93-
<Setter Property="Background" Value="Red"/>
94-
</Trigger>
95-
</ControlTemplate.Triggers>
96-
</ControlTemplate>
97-
</Setter.Value>
98-
</Setter>
76+
<Style x:Key="PictureView.TitleBar.IconCloseButton" TargetType="Button" BasedOn="{StaticResource PictureView.TitleBar.IconButton}">
77+
<Style.Triggers>
78+
<Trigger Property="IsMouseOver" Value="True">
79+
<Setter Property="Background" Value="Red"/>
80+
<Setter Property="Foreground" Value="White"/>
81+
</Trigger>
82+
</Style.Triggers>
9983
</Style>
10084

101-
<Style x:Key="PictureView.IconButton4" TargetType="Button" BasedOn="{StaticResource PictureView.IconButton}">
85+
<Style x:Key="PictureView.Navigation.IconButton" TargetType="Button" BasedOn="{StaticResource PictureView.IconButton}">
10286
<Setter Property="Width" Value="54"/>
10387
<Setter Property="Height" Value="54"/>
104-
<Setter Property="RenderTransformOrigin" Value="0.5,0.5"/>
10588
<Setter Property="Template">
10689
<Setter.Value>
10790
<ControlTemplate TargetType="Button">
@@ -116,18 +99,6 @@
11699
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
117100
</Border>
118101
</Grid>
119-
<ControlTemplate.Triggers>
120-
<Trigger Property="IsMouseOver" Value="True">
121-
<Setter Property="Foreground" Value="{StaticResource PictureView.IconButton.HighlightBrush}"/>
122-
</Trigger>
123-
<Trigger Property="IsPressed" Value="True">
124-
<Setter Property="RenderTransform">
125-
<Setter.Value>
126-
<ScaleTransform ScaleX="0.9" ScaleY="0.9"/>
127-
</Setter.Value>
128-
</Setter>
129-
</Trigger>
130-
</ControlTemplate.Triggers>
131102
</ControlTemplate>
132103
</Setter.Value>
133104
</Setter>

‎src/Themes/Zhai.PictureView.PictureWindow.xaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -47,19 +47,19 @@
4747
TextWrapping="NoWrap" TextTrimming="CharacterEllipsis"/>
4848
</StackPanel>
4949
<StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
50-
<Button x:Name="PinButton" Style="{StaticResource PictureView.IconButton2}" ToolTip="置顶" Visibility="Collapsed">
50+
<Button x:Name="PinButton" Style="{StaticResource PictureView.TitleBar.IconButton}" ToolTip="置顶" Visibility="Collapsed">
5151
<Path x:Name="PinButtonIcon" Data="{StaticResource Icon.Pin}" RenderTransformOrigin="0.5,0.5"/>
5252
</Button>
53-
<Button x:Name="MinimizeButton" Style="{StaticResource PictureView.IconButton2}" ToolTip="最小化">
53+
<Button x:Name="MinimizeButton" Style="{StaticResource PictureView.TitleBar.IconButton}" ToolTip="最小化">
5454
<Path Data="{StaticResource Icon.MinusScreen}"/>
5555
</Button>
56-
<Button x:Name="MaximizeButton" Style="{StaticResource PictureView.IconButton2}" ToolTip="全屏">
56+
<Button x:Name="MaximizeButton" Style="{StaticResource PictureView.TitleBar.IconButton}" ToolTip="全屏">
5757
<Path Data="{StaticResource Icon.FullScreen}"/>
5858
</Button>
59-
<Button x:Name="RestoreButton" Style="{StaticResource PictureView.IconButton2}" Visibility="Collapsed" ToolTip="退出全屏">
59+
<Button x:Name="RestoreButton" Style="{StaticResource PictureView.TitleBar.IconButton}" Visibility="Collapsed" ToolTip="退出全屏">
6060
<Path Data="{StaticResource Icon.RestoreScreen}"/>
6161
</Button>
62-
<Button x:Name="CloseButton" Style="{StaticResource PictureView.IconButton3}" ToolTip="关闭">
62+
<Button x:Name="CloseButton" Style="{StaticResource PictureView.TitleBar.IconCloseButton}" ToolTip="关闭">
6363
<Path Data="{StaticResource Icon.Close}"/>
6464
</Button>
6565
</StackPanel>

0 commit comments

Comments
 (0)