jianxin/GZStudio
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

adjust ui

Browse Source
This commit is contained in:
jianxin committed 2024-09-30 21:33:09 +08:00
1 parent 19305adba5
commit d595c4bf3c
2 files changed
+26 -37
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

GZStudio/Views/SettingsPage.xaml
+15 -17
View File
@@ -16,10 +16,10 @@
<StackPanel
x:Name="ContentArea">
<TextBlock x:Uid="Settings_Personalization" Style="{ThemeResource SubtitleTextBlockStyle}" />
<controls:SettingsCard Description="选择应用展示的主题"
Header="应用主题"
HeaderIcon="{ui:FontIcon Glyph=&#xE799;}">
HeaderIcon="{ui:FontIcon Glyph=&#xE790;}">
<ComboBox SelectedIndex="0">
<ComboBoxItem>默认</ComboBoxItem>
<ComboBoxItem>暗色</ComboBoxItem>
@@ -27,17 +27,15 @@
</ComboBox>
</controls:SettingsCard>
<TextBlock Style="{ThemeResource SubtitleTextBlockStyle}" x:Uid="Settings_About" />
<controls:SettingsExpander Description="© 2024. All rights reserved." Header="GZStudio">
<controls:SettingsExpander Description="© 2024. All rights reserved." Header="GZStudio"
HeaderIcon="{ui:FontIcon Glyph=&#xE946;}">
<TextBlock IsTextSelectionEnabled="True" Text="Version 0.0.1" />
<controls:SettingsExpander.Items>
<controls:SettingsCard HorizontalContentAlignment="Left" ContentAlignment="Left">
<StackPanel Margin="-12,0,0,0" Orientation="Vertical">
<TextBlock x:Uid="Settings_Theme" />
<StackPanel Margin="{StaticResource XSmallTopMargin}">
<RadioButton
x:Uid="Settings_Theme_Light"
@@ -45,26 +43,26 @@
IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Light, Mode=OneWay}"
FontSize="15"
GroupName="AppTheme">
<RadioButton.CommandParameter>
<xaml:ElementTheme>Light</xaml:ElementTheme>
</RadioButton.CommandParameter>
</RadioButton>
<RadioButton
<RadioButton.CommandParameter>
<xaml:ElementTheme>Light</xaml:ElementTheme>
</RadioButton.CommandParameter>
</RadioButton>
<RadioButton
x:Uid="Settings_Theme_Dark"
Command="{x:Bind ViewModel.SwitchThemeCommand}"
IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Dark, Mode=OneWay}"
FontSize="15"
GroupName="AppTheme">
<RadioButton.CommandParameter>
<xaml:ElementTheme>Dark</xaml:ElementTheme>
</RadioButton.CommandParameter>
</RadioButton>
<RadioButton
<RadioButton.CommandParameter>
<xaml:ElementTheme>Dark</xaml:ElementTheme>
</RadioButton.CommandParameter>
</RadioButton>
<RadioButton
x:Uid="Settings_Theme_Default"
Command="{x:Bind ViewModel.SwitchThemeCommand}"
IsChecked="{x:Bind ViewModel.ElementTheme, Converter={StaticResource EnumToBooleanConverter}, ConverterParameter=Default, Mode=OneWay}"
FontSize="15"
GroupName="AppTheme">
GroupName="AppTheme">
<RadioButton.CommandParameter>
<xaml:ElementTheme>Default</xaml:ElementTheme>
</RadioButton.CommandParameter>
GZStudio/Views/ShellPage.xaml
+11 -20
View File
@@ -15,23 +15,14 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<TitleBar
x:Name="AppTitleBar"
Title="GZStudio"
Subtitle="preview"
IsBackButtonVisible="True"
IsPaneToggleButtonVisible="True"
BorderThickness="2"
BorderBrush="{ThemeResource SurfaceStrokeColorDefaultBrush}"
CornerRadius="{StaticResource OverlayCornerRadius}"
></TitleBar>
</Grid>
<TitleBar x:Name="AppTitleBar"
Title="GZStudio"
Subtitle="preview"
IsBackButtonVisible="True"
IsPaneToggleButtonVisible="True"
BorderThickness="2"
BorderBrush="{ThemeResource SurfaceStrokeColorDefaultBrush}"
CornerRadius="{StaticResource OverlayCornerRadius}" />
<NavigationView
Grid.Row="1"
@@ -45,7 +36,7 @@
ExpandedModeThresholdWidth="1280"
DisplayModeChanged="NavigationViewControl_DisplayModeChanged"
Header="{x:Bind ((ContentControl)ViewModel.Selected).Content, Mode=OneWay}">
<NavigationView.MenuItems>
<!--
TODO: Update item titles by updating <x:Uid>.Content entries in Strings/en-us/Resources.resw.
@@ -56,7 +47,7 @@
-->
<NavigationViewItem x:Uid="Shell_AppList" helpers:NavigationHelper.NavigateTo="GZStudio.ViewModels.AppListViewModel">
<NavigationViewItem.Icon>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xe7c3;"/>
<FontIcon FontFamily="{StaticResource SymbolThemeFontFamily}" Glyph="&#xEA37;"/>
</NavigationViewItem.Icon>
</NavigationViewItem>
<NavigationViewItem x:Uid="Shell_Configuration" helpers:NavigationHelper.NavigateTo="GZStudio.ViewModels.ConfigurationViewModel">
@@ -65,7 +56,7 @@
</NavigationViewItem.Icon>
</NavigationViewItem>
</NavigationView.MenuItems>
<NavigationView.HeaderTemplate>
<DataTemplate>
<Grid>