mirrors/Magpie
2
0
Fork 0
mirror of https://github.com/Blinue/Magpie.git synced 2026-06-24 02:04:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

UI: 优化用户界面

Browse source
This commit is contained in:
刘旭 2022-06-24 23:36:31 +08:00
commit 2432915133
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/App/HomePage.xaml
View file

@ -42,12 +42,15 @@
<muxc:Expander.Content>
<local:SettingItem Title="倒计时时长" Style="{StaticResource ExpanderContentSettingStyle}">
<local:SettingItem.ActionContent>
<Slider Width="200" Minimum="1" Maximum="8" TickFrequency="1"/>
<Slider Width="150" Minimum="1" Maximum="5" TickFrequency="1"/>
</local:SettingItem.ActionContent>
</local:SettingItem>
</muxc:Expander.Content>
</muxc:Expander>
<local:SettingItem Title="记忆缩放窗口" Description="当该窗口回到前台时将自动缩放">
<local:SettingItem.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE944;"/>
</local:SettingItem.Icon>
<local:SettingItem.ActionContent>
<ToggleSwitch x:Name="PortableModeToggleSwitch" />
</local:SettingItem.ActionContent>

11
src/App/MainPage.xaml
View file

@ -23,6 +23,11 @@
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xE80F;"/>
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem Content="缩放模式" Tag="ScalingMods">
<muxc:NavigationViewItem.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xea42;"/>
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItemHeader Content="缩放配置" />
<muxc:NavigationViewItem Content="全局" Tag="GlobalConfig">
<muxc:NavigationViewItem.Icon>
@ -31,17 +36,17 @@
</muxc:NavigationViewItem>
<muxc:NavigationViewItem Content="游戏1" Tag="Game1">
<muxc:NavigationViewItem.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xEA86;"/>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xECAA;"/>
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem Content="游戏2" Tag="Game2">
<muxc:NavigationViewItem.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xEA86;"/>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xECAA;"/>
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem Content="游戏3" Tag="Game3">
<muxc:NavigationViewItem.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xEA86;"/>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xECAA;"/>
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem Icon="Add" Content="添加新配置" Tag="NewConfig" SelectsOnInvoked="False" />

2
src/App/SettingItem.xaml
View file

@ -6,12 +6,12 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
Background="{ThemeResource CardBackgroundBrush}"
IsTabStop="False"
IsEnabledChanged="IsEnabledChanged"
Loading="Loading">
<UserControl.Resources>
<Style TargetType="local:SettingItem">
<Setter Property="Background" Value="{ThemeResource CardBackgroundBrush}" />
<Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
<Setter Property="BorderThickness" Value="{ThemeResource CardBorderThickness}" />
<Setter Property="BorderBrush" Value="{ThemeResource CardStrokeColorDefaultBrush}" />