Skip to content

Commit

Permalink
修正一些错误
Browse files Browse the repository at this point in the history
  • Loading branch information
@wherewhere
wherewhere committed Feb 16, 2024
1 parent f9a995c commit c4ac446
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 34 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-package.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: build and package

on:
push:
branches: [main]
branches: [muxc]
pull_request:
branches: [main]
branches: [muxc]
paths:
- '.github/workflows/build-and-package.yml'
- 'CoreAppUWP**'
Expand Down
53 changes: 25 additions & 28 deletions CoreAppUWP/Pages/SettingsPages/SettingsPage.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,11 @@
Description="Information about the frameworks of this app."
Header="Framework Information"
Icon="">
<Grid Style="{StaticResource SettingExpanderContentGridStyle}">
<Grid
Margin="0,0,0,8"
ColumnSpacing="32"
RowSpacing="8"
Style="{StaticResource SettingExpanderContentGridStyle}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition Width="*" />
Expand All @@ -214,116 +218,108 @@
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<TextBlock
Grid.Row="0"
Grid.Column="0"
Padding="0,0,0,8"
Foreground="{ThemeResource SettingCardForeground}"
Text="Device Family" />
<TextBlock
Grid.Row="0"
Grid.Column="1"
Padding="32,0,0,8"
HorizontalAlignment="Left"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
Text="{x:Bind settingspages:SettingsViewModel.DeviceFamily}"
TextWrapping="WrapWholeWords" />

<TextBlock
Grid.Row="1"
Grid.Column="0"
Padding="0,0,0,8"
Foreground="{ThemeResource SettingCardForeground}"
Text="Framework" />
<TextBlock
Grid.Row="1"
Grid.Column="1"
Padding="32,0,0,8"
HorizontalAlignment="Left"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
Text="{x:Bind interopservices:RuntimeInformation.FrameworkDescription}"
TextWrapping="WrapWholeWords" />

<TextBlock
Grid.Row="2"
Grid.Column="0"
Padding="0,0,0,8"
Foreground="{ThemeResource SettingCardForeground}"
Text="CS/WinRT" />
<TextBlock
Grid.Row="2"
Grid.Column="1"
Padding="32,0,0,8"
HorizontalAlignment="Left"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
Text="{x:Bind settingspages:SettingsViewModel.WinRTVersion}"
TextWrapping="WrapWholeWords" />

<TextBlock
Grid.Row="3"
Grid.Column="0"
Padding="0,0,0,8"
Foreground="{ThemeResource SettingCardForeground}"
Text="Windows SDK" />
<TextBlock
Grid.Row="3"
Grid.Column="1"
Padding="32,0,0,8"
HorizontalAlignment="Left"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
Text="{x:Bind settingspages:SettingsViewModel.SDKVersion}"
TextWrapping="WrapWholeWords" />

TextWrapping="Wrap" />
<TextBlock
Grid.Row="4"
Grid.Column="0"
Padding="0,0,0,8"
Foreground="{ThemeResource SettingCardForeground}"
Text="Windows App SDK" />
<TextBlock
Grid.Row="4"
Grid.Column="1"
Padding="32,0,0,8"
HorizontalAlignment="Left"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
Text="{x:Bind settingspages:SettingsViewModel.WASVersion}"
TextWrapping="WrapWholeWords" />

TextWrapping="Wrap" />
<TextBlock
Grid.Row="5"
Grid.Column="0"
Padding="0,0,0,8"
Foreground="{ThemeResource SettingCardForeground}"
Text="Community Toolkit" />
<TextBlock
Grid.Row="5"
Grid.Column="1"
Padding="32,0,0,8"
HorizontalAlignment="Left"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
Text="{x:Bind settingspages:SettingsViewModel.ToolkitVersion}"
TextWrapping="WrapWholeWords" />

<TextBlock
Grid.Row="6"
Grid.Column="0"
Padding="0,0,0,8"
Foreground="{ThemeResource SettingCardForeground}"
Text="OS Platform" />
<TextBlock
Grid.Row="6"
Grid.Column="1"
Padding="32,0,0,8"
HorizontalAlignment="Left"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
Text="{x:Bind interopservices:RuntimeInformation.OSDescription}"
TextWrapping="WrapWholeWords" />

TextWrapping="Wrap" />
<TextBlock
Grid.Row="7"
Grid.Column="0"
Padding="0,0,0,8"
Foreground="{ThemeResource SettingCardForeground}"
Text="OS Architecture" />
<TextBlock
Grid.Row="7"
Grid.Column="1"
Padding="32,0,0,8"
HorizontalAlignment="Left"
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
IsTextSelectionEnabled="True"
Text="{x:Bind interopservices:RuntimeInformation.OSArchitecture}"
TextWrapping="WrapWholeWords" />
</Grid>
Expand Down Expand Up @@ -383,6 +379,7 @@
x:Name="AboutTextBlock"
HorizontalAlignment="Left"
x:Load="{x:Bind IsCoreWindow, Converter={StaticResource BoolNegationConverter}}"
IsTextSelectionEnabled="True"
Text="{x:Bind Provider.AboutTextBlockText, Mode=OneWay}"
TextWrapping="Wrap" />
</Grid>
Expand Down
8 changes: 4 additions & 4 deletions CoreAppUWP/Pages/SettingsPages/SettingsPage.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,17 @@ private async void Button_Click(object sender, RoutedEventArgs e)
case "ExitPIP":
if (IsCoreWindow)
{
ApplicationView.GetForCurrentView().IsViewModeSupported(ApplicationViewMode.Default);
_ = ApplicationView.GetForCurrentView().TryEnterViewModeAsync(ApplicationViewMode.Default);
if (ApplicationView.GetForCurrentView().IsViewModeSupported(ApplicationViewMode.Default))
{ _ = ApplicationView.GetForCurrentView().TryEnterViewModeAsync(ApplicationViewMode.Default); }
}
else if (this.GetWindowForElement() is DesktopWindow desktopWindow)
{ desktopWindow.AppWindow.SetPresenter(AppWindowPresenterKind.Default); }
break;
case "EnterPIP":
if (IsCoreWindow)
{
ApplicationView.GetForCurrentView().IsViewModeSupported(ApplicationViewMode.CompactOverlay);
_ = ApplicationView.GetForCurrentView().TryEnterViewModeAsync(ApplicationViewMode.CompactOverlay);
if (ApplicationView.GetForCurrentView().IsViewModeSupported(ApplicationViewMode.CompactOverlay))
{ _ = ApplicationView.GetForCurrentView().TryEnterViewModeAsync(ApplicationViewMode.CompactOverlay); }
}
else if (this.GetWindowForElement() is DesktopWindow desktopWindow)
{ desktopWindow.AppWindow.SetPresenter(AppWindowPresenterKind.CompactOverlay); }
Expand Down

0 comments on commit c4ac446

Please sign in to comment.