Skip to content

Commit 9f1ceee

Browse files
wtcpythonwtcpython
committed
代码质量提升
1 parent 644205a commit 9f1ceee

File tree

6 files changed

+66
-64
lines changed

6 files changed

+66
-64
lines changed

‎Assets/ReadmeSource/home-page.png‎

166 KB
Loading

‎Controls/ToolBar.xaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@
5555
Text="{x:Bind DocumentTitle}" TextTrimming="CharacterEllipsis"/>
5656

5757
<TextBlock
58-
Name="timeBlock" Text="{x:Bind Time}"
59-
Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Right"/>
58+
Text="{x:Bind Time}" Grid.Column="2"
59+
VerticalAlignment="Center" HorizontalAlignment="Right"/>
6060
</Grid>
6161
</DataTemplate>
6262
</ListView.ItemTemplate>

‎MainWindow.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</MenuFlyoutItem>
9494
<MenuFlyoutItem Text="Bing 主页" Click="OpenBingPage">
9595
<MenuFlyoutItem.Icon>
96-
<BitmapIcon UriSource="https://bing.com/favicon.ico"/>
96+
<ImageIcon Source="https://bing.com/favicon.ico" />
9797
</MenuFlyoutItem.Icon>
9898

9999
<MenuFlyoutItem.KeyboardAccelerators>

‎Pages/ImageViewer.xaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
mc:Ignorable="d">
10-
<Grid Margin="5" RowSpacing="5">
10+
<Grid Margin="5,0,0,0" RowSpacing="5">
1111

1212
<Grid.RowDefinitions>
1313
<RowDefinition Height="Auto"/>
@@ -29,15 +29,15 @@
2929
</StackPanel>
3030
</Button>
3131

32-
<Button Click="ImageRotateRequest" Background="{x:Null}" BorderThickness="0">
32+
<Button Click="ImageRotateRequest" Style="{StaticResource AlternateCloseButtonStyle}">
3333
<FontIcon Glyph="&#xe7ad;"/>
3434
</Button>
3535

36-
<Button Click="ImageDeleteRequest" Background="{x:Null}" BorderThickness="0">
36+
<Button Click="ImageDeleteRequest" Style="{StaticResource AlternateCloseButtonStyle}">
3737
<FontIcon Glyph="&#xe74d;"/>
3838
</Button>
3939

40-
<Button Click="PrintImageRequest" Background="{x:Null}" BorderThickness="0">
40+
<Button Click="PrintImageRequest" Style="{StaticResource AlternateCloseButtonStyle}">
4141
<FontIcon Glyph="&#xe749;"/>
4242
</Button>
4343

‎Settings/AppearanceItem.xaml‎

Lines changed: 51 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -8,60 +8,62 @@
88
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
99
xmlns:controls="using:CommunityToolkit.WinUI.Controls"
1010
mc:Ignorable="d">
11-
<StackPanel Spacing="10" Margin="15">
11+
<ScrollView>
1212

13-
<controls:SettingsCard
14-
Header="整体外观"
15-
Description="适用于新的选项卡、页面、对话框和其他菜单。">
16-
</controls:SettingsCard>
13+
<StackPanel Spacing="10" Margin="15">
14+
<controls:SettingsCard
15+
Header="整体外观"
16+
Description="适用于新的选项卡、页面、对话框和其他菜单。">
17+
</controls:SettingsCard>
1718

18-
<GridView Name="appearanceView" SelectionMode="Single" SelectionChanged="AppearanceChanged">
19-
<GridView.ItemContainerStyle>
20-
<Style TargetType="GridViewItem" BasedOn="{StaticResource DefaultGridViewItemStyle}">
21-
<Setter Property="Margin" Value="10"/>
22-
</Style>
23-
</GridView.ItemContainerStyle>
24-
<StackPanel>
25-
<Canvas Width="150" Height="100">
26-
<Polygon
27-
Fill="Black"
28-
Points="0,0,0,100,150,100"/>
29-
<Polygon
30-
Fill="White"
31-
Points="0,0,150,0,150,100"/>
32-
</Canvas>
33-
<TextBlock Text="系统默认" Margin="10"/>
34-
</StackPanel>
19+
<GridView Name="appearanceView" SelectionMode="Single" SelectionChanged="AppearanceChanged">
20+
<GridView.ItemContainerStyle>
21+
<Style TargetType="GridViewItem" BasedOn="{StaticResource DefaultGridViewItemStyle}">
22+
<Setter Property="Margin" Value="10"/>
23+
</Style>
24+
</GridView.ItemContainerStyle>
25+
<StackPanel>
26+
<Canvas Width="150" Height="100">
27+
<Polygon
28+
Fill="Black"
29+
Points="0,0,0,100,150,100"/>
30+
<Polygon
31+
Fill="White"
32+
Points="0,0,150,0,150,100"/>
33+
</Canvas>
34+
<TextBlock Text="系统默认" Margin="10"/>
35+
</StackPanel>
3536

36-
<StackPanel>
37-
<Rectangle Width="150" Height="100" Fill="White"/>
38-
<TextBlock Text="浅色" Margin="10"/>
39-
</StackPanel>
37+
<StackPanel>
38+
<Rectangle Width="150" Height="100" Fill="White"/>
39+
<TextBlock Text="浅色" Margin="10"/>
40+
</StackPanel>
4041

41-
<StackPanel>
42-
<Rectangle Width="150" Height="100" Fill="black"/>
43-
<TextBlock Text="深色" Margin="10"/>
44-
</StackPanel>
45-
</GridView>
42+
<StackPanel>
43+
<Rectangle Width="150" Height="100" Fill="black"/>
44+
<TextBlock Text="深色" Margin="10"/>
45+
</StackPanel>
46+
</GridView>
4647

47-
<controls:SettingsCard
48-
Header="在浏览器中显示 Windows 11 视觉效果"
49-
Description="向浏览器添加 Mica 效果。此功能取决于你的设备和 Windows 设置。">
50-
<ToggleSwitch Name="showMicaSwitch" Toggled="MicaEffectChanged"/>
51-
</controls:SettingsCard>
48+
<controls:SettingsCard
49+
Header="在浏览器中显示 Windows 11 视觉效果"
50+
Description="向浏览器添加 Mica 效果。此功能取决于你的设备和 Windows 设置。">
51+
<ToggleSwitch Name="showMicaSwitch" Toggled="MicaEffectChanged"/>
52+
</controls:SettingsCard>
5253

53-
<TextBlock Text="自定义工具栏" Style="{ThemeResource FlyoutPickerTitleTextBlockStyle}" Margin="5,10,0,0"/>
54-
55-
<ItemsControl x:Name="toolBarVisualView">
56-
<ItemsControl.ItemTemplate>
57-
<DataTemplate x:DataType="local:ToolBarVisual">
58-
<controls:SettingsCard
59-
Header="{x:Bind Description}">
60-
<ToggleSwitch IsOn="{x:Bind Visual}" Toggled="VisualChanged" />
61-
</controls:SettingsCard>
62-
</DataTemplate>
63-
</ItemsControl.ItemTemplate>
64-
</ItemsControl>
65-
</StackPanel>
54+
<TextBlock Text="自定义工具栏" Style="{ThemeResource FlyoutPickerTitleTextBlockStyle}" Margin="5,10,0,0"/>
6655

56+
<ItemsControl x:Name="toolBarVisualView">
57+
<ItemsControl.ItemTemplate>
58+
<DataTemplate x:DataType="local:ToolBarVisual">
59+
<controls:SettingsCard
60+
Header="{x:Bind Description}">
61+
<ToggleSwitch IsOn="{x:Bind Visual}" Toggled="VisualChanged" />
62+
</controls:SettingsCard>
63+
</DataTemplate>
64+
</ItemsControl.ItemTemplate>
65+
</ItemsControl>
66+
</StackPanel>
67+
68+
</ScrollView>
6769
</Page>

‎Settings/StartItem.xaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,32 +41,32 @@
4141
</Grid>
4242

4343
<controls:SettingsCard
44-
Header='在工具栏上显示"首页"按钮'>
44+
Header='在工具栏上显示"首页"按钮'>
4545
<ToggleSwitch Name="setHomeButton" Toggled="HomeButtonVisualChanged"/>
4646
</controls:SettingsCard>
4747

4848
<controls:SettingsCard
49-
Header="选择搜索引擎">
49+
Header="选择搜索引擎">
5050
<ComboBox
51-
Name="searchEngineBox"
52-
SelectionChanged="SearchEngineChanged"/>
51+
Name="searchEngineBox"
52+
SelectionChanged="SearchEngineChanged"/>
5353
</controls:SettingsCard>
5454

5555
<TextBlock Text="新标签页" Style="{ThemeResource FlyoutPickerTitleTextBlockStyle}" Margin="5,10,0,0"/>
5656

5757
<controls:SettingsCard
58-
Header="在新标签页显示推荐的网站">
58+
Header="在新标签页显示推荐的网站">
5959
<ToggleSwitch Name="showSuggestUri" Toggled="SuggestUriVisualChanged"/>
6060
</controls:SettingsCard>
6161

6262
<controls:SettingsExpander
63-
Header="在新标签页显示背景图">
63+
Header="在新标签页显示背景图">
6464
<ToggleSwitch Name="showBackground" Toggled="ShowBackgroundChanged"/>
6565

6666
<controls:SettingsExpander.Items>
6767
<controls:SettingsCard
68-
x:Name="backgroundCard"
69-
Header="选择背景图片的路径">
68+
x:Name="backgroundCard"
69+
Header="选择背景图片的路径">
7070
<Button Content="更改" Click="SetBackgroundImage"/>
7171
</controls:SettingsCard>
7272
</controls:SettingsExpander.Items>

0 commit comments

Comments
 (0)