Fun/Snap.Hutao
1
0
Fork 0
mirror of https://jihulab.com/DGP-Studio/Snap.Hutao.git synced 2025-11-19 21:02:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix #1061

Browse Source
This commit is contained in:
Lightczx
2023-11-01 15:26:36 +08:00
parent 5943b1a1fb
commit eec47b72c7
5 changed files with 190 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Snap.Hutao/Snap.Hutao/Control/Theme/ItemsPanelTemplate.xaml
View File

@@ -14,6 +14,9 @@
<ItemsPanelTemplate x:Key="HorizontalStackPanelTemplate"> <ItemsPanelTemplate x:Key="HorizontalStackPanelTemplate">
<StackPanel Orientation="Horizontal"/> <StackPanel Orientation="Horizontal"/>
</ItemsPanelTemplate> </ItemsPanelTemplate>
<ItemsPanelTemplate x:Key="HorizontalStackPanelSpacing2Template">
<StackPanel Orientation="Horizontal" Spacing="2"/>
</ItemsPanelTemplate>
<ItemsPanelTemplate x:Key="UniformGridColumns5Spacing4Template"> <ItemsPanelTemplate x:Key="UniformGridColumns5Spacing4Template">
<cwcont:UniformGrid <cwcont:UniformGrid
ColumnSpacing="4" ColumnSpacing="4"

6
src/Snap.Hutao/Snap.Hutao/Model/Entity/SettingEntry.Constant.cs
View File

@@ -73,11 +73,15 @@ internal sealed partial class SettingEntry
/// </summary> /// </summary>
public const string LaunchScreenWidth = "Launch.ScreenWidth"; public const string LaunchScreenWidth = "Launch.ScreenWidth";
public const string LaunchIsScreenWidthEnabled = "Launch.IsScreenWidthEnabled";
/// <summary> /// <summary>
/// 启动游戏 高度 /// 启动游戏 高度
/// </summary> /// </summary>
public const string LaunchScreenHeight = "Launch.ScreenHeight"; public const string LaunchScreenHeight = "Launch.ScreenHeight";
public const string LaunchIsScreenHeightEnabled = "Launch.IsScreenHeightEnabled";
/// <summary> /// <summary>
/// 启动游戏 解锁帧率 /// 启动游戏 解锁帧率
/// </summary> /// </summary>
@@ -93,6 +97,8 @@ internal sealed partial class SettingEntry
/// </summary> /// </summary>
public const string LaunchMonitor = "Launch.Monitor"; public const string LaunchMonitor = "Launch.Monitor";
public const string LaunchIsMonitorEnabled = "Launch.IsMonitorEnabled";
/// <summary> /// <summary>
/// 启动游戏 多倍启动 /// 启动游戏 多倍启动
/// </summary> /// </summary>

21
src/Snap.Hutao/Snap.Hutao/Service/Game/LaunchOptions.cs
View File

@@ -27,10 +27,13 @@ internal sealed class LaunchOptions : DbStoreOptions
private bool? isBorderless; private bool? isBorderless;
private bool? isExclusive; private bool? isExclusive;
private int? screenWidth; private int? screenWidth;
private bool? isScreenWidthEnabled;
private int? screenHeight; private int? screenHeight;
private bool? isScreenHeightEnabled;
private bool? unlockFps; private bool? unlockFps;
private int? targetFps; private int? targetFps;
private NameValue<int>? monitor; private NameValue<int>? monitor;
private bool? isMonitorEnabled;
/// <summary> /// <summary>
/// 构造一个新的启动游戏选项 /// 构造一个新的启动游戏选项
@@ -83,6 +86,12 @@ internal sealed class LaunchOptions : DbStoreOptions
set => SetOption(ref screenWidth, SettingEntry.LaunchScreenWidth, value); set => SetOption(ref screenWidth, SettingEntry.LaunchScreenWidth, value);
} }
public bool IsScreenWidthEnabled
{
get => GetOption(ref isScreenWidthEnabled, SettingEntry.LaunchIsScreenWidthEnabled, true);
set => SetOption(ref isScreenWidthEnabled, SettingEntry.LaunchIsScreenWidthEnabled, value);
}
/// <summary> /// <summary>
/// 屏幕高度 /// 屏幕高度
/// </summary> /// </summary>
@@ -92,6 +101,12 @@ internal sealed class LaunchOptions : DbStoreOptions
set => SetOption(ref screenHeight, SettingEntry.LaunchScreenHeight, value); set => SetOption(ref screenHeight, SettingEntry.LaunchScreenHeight, value);
} }
public bool IsScreenHeightEnabled
{
get => GetOption(ref isScreenHeightEnabled, SettingEntry.LaunchIsScreenHeightEnabled, true);
set => SetOption(ref isScreenHeightEnabled, SettingEntry.LaunchIsScreenHeightEnabled, value);
}
/// <summary> /// <summary>
/// 是否全屏 /// 是否全屏
/// </summary> /// </summary>
@@ -131,6 +146,12 @@ internal sealed class LaunchOptions : DbStoreOptions
} }
} }
public bool IsMonitorEnabled
{
get => GetOption(ref isMonitorEnabled, SettingEntry.LaunchIsMonitorEnabled, true);
set => SetOption(ref isMonitorEnabled, SettingEntry.LaunchIsMonitorEnabled, value);
}
private static void InitializeMonitors(List<NameValue<int>> monitors) private static void InitializeMonitors(List<NameValue<int>> monitors)
{ {
// This list can't use foreach // This list can't use foreach

391
src/Snap.Hutao/Snap.Hutao/View/Page/GachaLogPage.xaml
View File

@@ -137,6 +137,89 @@
IsLoading="{Binding HutaoCloudViewModel.IsInitialized, Converter={StaticResource BoolNegationConverter}}"/> IsLoading="{Binding HutaoCloudViewModel.IsInitialized, Converter={StaticResource BoolNegationConverter}}"/>
</Grid> </Grid>
</Flyout> </Flyout>
<DataTemplate x:Key="HistoryWishItemTemplate">
<Border Width="40" Style="{StaticResource BorderCardStyle}">
<StackPanel>
<shvc:ItemIcon
Width="40"
Height="40"
Icon="{Binding Icon}"
Quality="{Binding Quality}"/>
<TextBlock
HorizontalTextAlignment="Center"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding Count}"
TextTrimming="None"
TextWrapping="NoWrap"/>
</StackPanel>
</Border>
</DataTemplate>
<DataTemplate x:Key="HistoryWishListTemplate">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<StackPanel Margin="0,8,0,0" Orientation="Horizontal">
<TextBlock
Width="32"
Style="{StaticResource BaseTextBlockStyle}"
Text="{Binding Version}"/>
<TextBlock
Margin="0,0,0,0"
Style="{StaticResource BaseTextBlockStyle}"
Text="{Binding Name}"/>
</StackPanel>
<TextBlock
Margin="0,8,0,0"
HorizontalAlignment="Right"
Style="{StaticResource BaseTextBlockStyle}"
Text="{Binding TotalCountFormatted}"/>
<ItemsControl
Grid.Row="1"
Margin="0,6,0,0"
HorizontalAlignment="Left"
ItemTemplate="{StaticResource HistoryWishItemTemplate}"
ItemsPanel="{StaticResource HorizontalStackPanelSpacing2Template}"
ItemsSource="{Binding OrangeUpList}"/>
<ItemsControl
Grid.Row="1"
Margin="0,6,0,0"
HorizontalAlignment="Right"
ItemTemplate="{StaticResource HistoryWishItemTemplate}"
ItemsPanel="{StaticResource HorizontalStackPanelSpacing2Template}"
ItemsSource="{Binding PurpleUpList}"/>
<TextBlock
Grid.Row="2"
Margin="0,6,0,8"
Opacity="0.6"
Text="{Binding TimeSpanFormatted}"/>
</Grid>
</DataTemplate>
<DataTemplate x:Key="HistoryWishGridTemplate">
<Grid>
<shvc:ItemIcon
Badge="{Binding Badge}"
Icon="{Binding Icon}"
Quality="{Binding Quality}"/>
<Border
HorizontalAlignment="Right"
VerticalAlignment="Top"
Background="#80000000"
CornerRadius="0,6,0,6">
<TextBlock
Margin="6,0,6,2"
Foreground="#FFFFFFFF"
Text="{Binding Count}"/>
</Border>
</Grid>
</DataTemplate>
</Page.Resources> </Page.Resources>
<Grid Visibility="{Binding IsInitialized, Converter={StaticResource BoolToVisibilityConverter}}"> <Grid Visibility="{Binding IsInitialized, Converter={StaticResource BoolToVisibilityConverter}}">
@@ -232,100 +315,10 @@
OpenPaneLength="323" OpenPaneLength="323"
PaneBackground="Transparent"> PaneBackground="Transparent">
<SplitView.Pane> <SplitView.Pane>
<ListView ItemsSource="{Binding Statistics.HistoryWishes}" SelectedItem="{Binding SelectedHistoryWish, Mode=TwoWay}"> <ListView
<ListView.ItemTemplate> ItemTemplate="{StaticResource HistoryWishListTemplate}"
<DataTemplate> ItemsSource="{Binding Statistics.HistoryWishes}"
<Grid> SelectedItem="{Binding SelectedHistoryWish, Mode=TwoWay}"/>
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<StackPanel Margin="0,8,0,0" Orientation="Horizontal">
<TextBlock
Width="32"
Style="{StaticResource BaseTextBlockStyle}"
Text="{Binding Version}"/>
<TextBlock
Margin="0,0,0,0"
Style="{StaticResource BaseTextBlockStyle}"
Text="{Binding Name}"/>
</StackPanel>
<TextBlock
Margin="0,8,0,0"
HorizontalAlignment="Right"
Style="{StaticResource BaseTextBlockStyle}"
Text="{Binding TotalCountFormatted}"/>
<ItemsControl
Grid.Row="1"
Margin="0,6,0,0"
HorizontalAlignment="Left"
ItemsSource="{Binding OrangeUpList}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Horizontal" Spacing="2"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<Border Width="40" Style="{StaticResource BorderCardStyle}">
<StackPanel>
<shvc:ItemIcon
Width="40"
Height="40"
Icon="{Binding Icon}"
Quality="{Binding Quality}"/>
<TextBlock
HorizontalTextAlignment="Center"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding Count}"
TextTrimming="None"
TextWrapping="NoWrap"/>
</StackPanel>
</Border>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<ItemsControl
Grid.Row="1"
Margin="0,6,0,0"
HorizontalAlignment="Right"
ItemsSource="{Binding PurpleUpList}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Horizontal" Spacing="2"/>
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<Border Width="40" Style="{StaticResource BorderCardStyle}">
<StackPanel>
<shvc:ItemIcon
Width="40"
Height="40"
Icon="{Binding Icon}"
Quality="{Binding Quality}"/>
<TextBlock
HorizontalTextAlignment="Center"
Style="{StaticResource CaptionTextBlockStyle}"
Text="{Binding Count}"
TextTrimming="None"
TextWrapping="NoWrap"/>
</StackPanel>
</Border>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<TextBlock
Grid.Row="2"
Margin="0,6,0,8"
Opacity="0.6"
Text="{Binding TimeSpanFormatted}"/>
</Grid>
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
</SplitView.Pane> </SplitView.Pane>
<SplitView.Content> <SplitView.Content>
<ScrollViewer> <ScrollViewer>
@@ -347,91 +340,35 @@
</Border> </Border>
</Border> </Border>
<TextBlock <TextBlock
Margin="0,16,0,8" Margin="0,16,0,8"
Style="{StaticResource BaseTextBlockStyle}" Style="{StaticResource BaseTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}" Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"
Visibility="{Binding SelectedHistoryWish.OrangeList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/> Visibility="{Binding SelectedHistoryWish.OrangeList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/>
<GridView ItemsSource="{Binding SelectedHistoryWish.OrangeList}" SelectionMode="None"> <GridView
<GridView.ItemTemplate> ItemTemplate="{StaticResource HistoryWishGridTemplate}"
<DataTemplate> ItemsSource="{Binding SelectedHistoryWish.OrangeList}"
<Grid> SelectionMode="None"/>
<shvc:ItemIcon
Badge="{Binding Badge}"
Icon="{Binding Icon}"
Quality="{Binding Quality}"/>
<Border
HorizontalAlignment="Right"
VerticalAlignment="Top"
Background="#80000000"
CornerRadius="0,6,0,6">
<TextBlock
Margin="6,0,6,2"
Foreground="#FFFFFFFF"
Text="{Binding Count}"/>
</Border>
</Grid>
</DataTemplate>
</GridView.ItemTemplate>
</GridView>
<TextBlock <TextBlock
Margin="0,0,0,8" Margin="0,0,0,8"
Style="{StaticResource BaseTextBlockStyle}" Style="{StaticResource BaseTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}" Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"
Visibility="{Binding SelectedHistoryWish.PurpleList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/> Visibility="{Binding SelectedHistoryWish.PurpleList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/>
<GridView ItemsSource="{Binding SelectedHistoryWish.PurpleList}" SelectionMode="None"> <GridView
<GridView.ItemTemplate> ItemTemplate="{StaticResource HistoryWishGridTemplate}"
<DataTemplate> ItemsSource="{Binding SelectedHistoryWish.PurpleList}"
<Grid> SelectionMode="None"/>
<shvc:ItemIcon
Badge="{Binding Badge}"
Icon="{Binding Icon}"
Quality="{Binding Quality}"/>
<Border
HorizontalAlignment="Right"
VerticalAlignment="Top"
Background="#80000000"
CornerRadius="0,6,0,6">
<TextBlock
Margin="6,0,6,2"
Foreground="#FFFFFFFF"
Text="{Binding Count}"/>
</Border>
</Grid>
</DataTemplate>
</GridView.ItemTemplate>
</GridView>
<TextBlock <TextBlock
Margin="0,0,0,8" Margin="0,0,0,8"
Style="{StaticResource BaseTextBlockStyle}" Style="{StaticResource BaseTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardBlueText}" Text="{shcm:ResourceString Name=ViewControlStatisticsCardBlueText}"
Visibility="{Binding SelectedHistoryWish.BlueList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/> Visibility="{Binding SelectedHistoryWish.BlueList.Count, Converter={StaticResource Int32ToVisibilityConverter}}"/>
<GridView ItemsSource="{Binding SelectedHistoryWish.BlueList}" SelectionMode="None"> <GridView
<GridView.ItemTemplate> ItemTemplate="{StaticResource HistoryWishGridTemplate}"
<DataTemplate> ItemsSource="{Binding SelectedHistoryWish.BlueList}"
<Grid> SelectionMode="None"/>
<shvc:ItemIcon
Badge="{Binding Badge}"
Icon="{Binding Icon}"
Quality="{Binding Quality}"/>
<Border
HorizontalAlignment="Right"
VerticalAlignment="Top"
Background="#80000000"
CornerRadius="0,6,0,6">
<TextBlock
Margin="6,0,6,2"
Foreground="#FFFFFFFF"
Text="{Binding Count}"/>
</Border>
</Grid>
</DataTemplate>
</GridView.ItemTemplate>
</GridView>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
</SplitView.Content> </SplitView.Content>
@@ -444,55 +381,19 @@
Margin="0,16,0,8" Margin="0,16,0,8"
Style="{StaticResource BaseTextBlockStyle}" Style="{StaticResource BaseTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"/> Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"/>
<GridView ItemsSource="{Binding Statistics.OrangeAvatars}" SelectionMode="None"> <GridView
<GridView.ItemTemplate> ItemTemplate="{StaticResource HistoryWishItemTemplate}"
<DataTemplate> ItemsSource="{Binding Statistics.OrangeAvatars}"
<Grid> SelectionMode="None"/>
<shvc:ItemIcon
Badge="{Binding Badge}"
Icon="{Binding Icon}"
Quality="{Binding Quality}"/>
<Border
HorizontalAlignment="Right"
VerticalAlignment="Top"
Background="#80000000"
CornerRadius="0,6,0,6">
<TextBlock
Margin="6,0,6,2"
Foreground="#FFFFFFFF"
Text="{Binding Count}"/>
</Border>
</Grid>
</DataTemplate>
</GridView.ItemTemplate>
</GridView>
<TextBlock <TextBlock
Margin="0,0,0,8" Margin="0,0,0,8"
Style="{StaticResource BaseTextBlockStyle}" Style="{StaticResource BaseTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"/> Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"/>
<GridView ItemsSource="{Binding Statistics.PurpleAvatars}" SelectionMode="None"> <GridView
<GridView.ItemTemplate> ItemTemplate="{StaticResource HistoryWishItemTemplate}"
<DataTemplate> ItemsSource="{Binding Statistics.PurpleAvatars}"
<Grid> SelectionMode="None"/>
<shvc:ItemIcon
Badge="{Binding Badge}"
Icon="{Binding Icon}"
Quality="{Binding Quality}"/>
<Border
HorizontalAlignment="Right"
VerticalAlignment="Top"
Background="#80000000"
CornerRadius="0,6,0,6">
<TextBlock
Margin="6,0,6,2"
Foreground="#FFFFFFFF"
Text="{Binding Count}"/>
</Border>
</Grid>
</DataTemplate>
</GridView.ItemTemplate>
</GridView>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
</PivotItem> </PivotItem>
@@ -503,82 +404,28 @@
Margin="0,16,0,8" Margin="0,16,0,8"
Style="{StaticResource BaseTextBlockStyle}" Style="{StaticResource BaseTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"/> Text="{shcm:ResourceString Name=ViewControlStatisticsCardOrangeText}"/>
<GridView ItemsSource="{Binding Statistics.OrangeWeapons}" SelectionMode="None"> <GridView
<GridView.ItemTemplate> ItemTemplate="{StaticResource HistoryWishItemTemplate}"
<DataTemplate> ItemsSource="{Binding Statistics.OrangeWeapons}"
<Grid> SelectionMode="None"/>
<shvc:ItemIcon
Badge="{Binding Badge}"
Icon="{Binding Icon}"
Quality="{Binding Quality}"/>
<Border
HorizontalAlignment="Right"
VerticalAlignment="Top"
Background="#80000000"
CornerRadius="0,6,0,6">
<TextBlock
Margin="6,0,6,2"
Foreground="#FFFFFFFF"
Text="{Binding Count}"/>
</Border>
</Grid>
</DataTemplate>
</GridView.ItemTemplate>
</GridView>
<TextBlock <TextBlock
Margin="0,0,0,8" Margin="0,0,0,8"
Style="{StaticResource BaseTextBlockStyle}" Style="{StaticResource BaseTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"/> Text="{shcm:ResourceString Name=ViewControlStatisticsCardPurpleText}"/>
<GridView ItemsSource="{Binding Statistics.PurpleWeapons}" SelectionMode="None"> <GridView
<GridView.ItemTemplate> ItemTemplate="{StaticResource HistoryWishItemTemplate}"
<DataTemplate> ItemsSource="{Binding Statistics.PurpleWeapons}"
<Grid> SelectionMode="None"/>
<shvc:ItemIcon
Badge="{Binding Badge}"
Icon="{Binding Icon}"
Quality="{Binding Quality}"/>
<Border
HorizontalAlignment="Right"
VerticalAlignment="Top"
Background="#80000000"
CornerRadius="0,6,0,6">
<TextBlock
Margin="6,0,6,2"
Foreground="#FFFFFFFF"
Text="{Binding Count}"/>
</Border>
</Grid>
</DataTemplate>
</GridView.ItemTemplate>
</GridView>
<TextBlock <TextBlock
Margin="0,0,0,8" Margin="0,0,0,8"
Style="{StaticResource BaseTextBlockStyle}" Style="{StaticResource BaseTextBlockStyle}"
Text="{shcm:ResourceString Name=ViewControlStatisticsCardBlueText}"/> Text="{shcm:ResourceString Name=ViewControlStatisticsCardBlueText}"/>
<GridView ItemsSource="{Binding Statistics.BlueWeapons}" SelectionMode="None"> <GridView
<GridView.ItemTemplate> ItemTemplate="{StaticResource HistoryWishItemTemplate}"
<DataTemplate> ItemsSource="{Binding Statistics.BlueWeapons}"
<Grid> SelectionMode="None"/>
<shvc:ItemIcon
Badge="{Binding Badge}"
Icon="{Binding Icon}"
Quality="{Binding Quality}"/>
<Border
HorizontalAlignment="Right"
VerticalAlignment="Top"
Background="#80000000"
CornerRadius="0,6,0,6">
<TextBlock
Margin="6,0,6,2"
Foreground="#FFFFFFFF"
Text="{Binding Count}"/>
</Border>
</Grid>
</DataTemplate>
</GridView.ItemTemplate>
</GridView>
</StackPanel> </StackPanel>
</ScrollViewer> </ScrollViewer>
</PivotItem> </PivotItem>

76
src/Snap.Hutao/Snap.Hutao/View/Page/LaunchGamePage.xaml
View File

@@ -26,6 +26,14 @@
<Page.Resources> <Page.Resources>
<shc:BindingProxy x:Key="BindingProxy" DataContext="{Binding}"/> <shc:BindingProxy x:Key="BindingProxy" DataContext="{Binding}"/>
<Visibility x:Key="VisibilityCollapsed">Collapsed</Visibility> <Visibility x:Key="VisibilityCollapsed">Collapsed</Visibility>
<DataTemplate x:Key="GameResourceTemplate">
<shvc:LaunchGameResourceExpander
Margin="16,16,16,0"
cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
DataContext="{Binding Mode=OneWay}"
Header="{shcm:ResourceString Name=ViewPageLaunchGameResourceDiffHeader}"/>
</DataTemplate>
</Page.Resources> </Page.Resources>
<Grid> <Grid>
<Grid <Grid
@@ -202,23 +210,35 @@
<ToggleSwitch Width="156" IsOn="{Binding Options.IsBorderless, Mode=TwoWay}"/> <ToggleSwitch Width="156" IsOn="{Binding Options.IsBorderless, Mode=TwoWay}"/>
</cwc:SettingsCard> </cwc:SettingsCard>
<cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceScreenWidthDescription}" Header="-screen-width"> <cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceScreenWidthDescription}" Header="-screen-width">
<NumberBox <StackPanel Orientation="Horizontal" Spacing="16">
Width="156" <NumberBox
Padding="10,6,0,0" Width="156"
Value="{Binding Options.ScreenWidth, Mode=TwoWay}"/> Padding="10,6,0,0"
IsEnabled="{Binding Options.IsScreenWidthEnabled}"
Value="{Binding Options.ScreenWidth, Mode=TwoWay}"/>
<ToggleSwitch Width="156" IsOn="{Binding Options.IsScreenWidthEnabled, Mode=TwoWay}"/>
</StackPanel>
</cwc:SettingsCard> </cwc:SettingsCard>
<cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceScreenHeightDescription}" Header="-screen-height"> <cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameAppearanceScreenHeightDescription}" Header="-screen-height">
<NumberBox <StackPanel Orientation="Horizontal" Spacing="16">
Width="156" <NumberBox
Padding="10,6,0,0" Width="156"
Value="{Binding Options.ScreenHeight, Mode=TwoWay}"/> Padding="10,6,0,0"
IsEnabled="{Binding Options.IsScreenHeightEnabled}"
Value="{Binding Options.ScreenHeight, Mode=TwoWay}"/>
<ToggleSwitch Width="156" IsOn="{Binding Options.IsScreenHeightEnabled, Mode=TwoWay}"/>
</StackPanel>
</cwc:SettingsCard> </cwc:SettingsCard>
<cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameMonitorsDescription}" Header="-monitor"> <cwc:SettingsCard Description="{shcm:ResourceString Name=ViewPageLaunchGameMonitorsDescription}" Header="-monitor">
<ComboBox <StackPanel Orientation="Horizontal" Spacing="16">
Width="156" <ComboBox
DisplayMemberPath="Name" Width="156"
ItemsSource="{Binding Options.Monitors}" DisplayMemberPath="Name"
SelectedItem="{Binding Options.Monitor, Mode=TwoWay}"/> IsEnabled="{Binding Options.IsMonitorEnabled}"
ItemsSource="{Binding Options.Monitors}"
SelectedItem="{Binding Options.Monitor, Mode=TwoWay}"/>
<ToggleSwitch Width="156" IsOn="{Binding Options.IsMonitorEnabled, Mode=TwoWay}"/>
</StackPanel>
</cwc:SettingsCard> </cwc:SettingsCard>
</cwc:SettingsExpander.Items> </cwc:SettingsExpander.Items>
</cwc:SettingsExpander> </cwc:SettingsExpander>
@@ -266,33 +286,19 @@
DataContext="{Binding GameResource.PreDownloadGame.Latest, Mode=OneWay}" DataContext="{Binding GameResource.PreDownloadGame.Latest, Mode=OneWay}"
Header="{shcm:ResourceString Name=ViewPageLaunchGameResourcePreDownloadHeader}" Header="{shcm:ResourceString Name=ViewPageLaunchGameResourcePreDownloadHeader}"
Visibility="{Binding FallbackValue={StaticResource VisibilityCollapsed}, Converter={StaticResource EmptyObjectToVisibilityConverter}}"/> Visibility="{Binding FallbackValue={StaticResource VisibilityCollapsed}, Converter={StaticResource EmptyObjectToVisibilityConverter}}"/>
<ItemsControl Margin="0,0,0,0" ItemsSource="{Binding GameResource.PreDownloadGame.Diffs, Mode=OneWay}"> <ItemsControl
<ItemsControl.ItemTemplate> Margin="0,0,0,0"
<DataTemplate> ItemTemplate="{StaticResource GameResourceTemplate}"
<shvc:LaunchGameResourceExpander ItemsSource="{Binding GameResource.PreDownloadGame.Diffs, Mode=OneWay}"/>
Margin="16,16,16,0"
cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
DataContext="{Binding Mode=OneWay}"
Header="{shcm:ResourceString Name=ViewPageLaunchGameResourceDiffHeader}"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
<shvc:LaunchGameResourceExpander <shvc:LaunchGameResourceExpander
Margin="16,16,16,0" Margin="16,16,16,0"
cw:Effects.Shadow="{ThemeResource CompatCardShadow}" cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
DataContext="{Binding GameResource.Game.Latest, Mode=OneWay}" DataContext="{Binding GameResource.Game.Latest, Mode=OneWay}"
Header="{shcm:ResourceString Name=ViewPageLaunchGameResourceLatestHeader}"/> Header="{shcm:ResourceString Name=ViewPageLaunchGameResourceLatestHeader}"/>
<ItemsControl Margin="0,0,0,16" ItemsSource="{Binding GameResource.Game.Diffs, Mode=OneWay}"> <ItemsControl
<ItemsControl.ItemTemplate> Margin="0,0,0,16"
<DataTemplate> ItemTemplate="{StaticResource GameResourceTemplate}"
<shvc:LaunchGameResourceExpander ItemsSource="{Binding GameResource.Game.Diffs, Mode=OneWay}"/>
Margin="16,16,16,0"
cw:Effects.Shadow="{ThemeResource CompatCardShadow}"
DataContext="{Binding Mode=OneWay}"
Header="{shcm:ResourceString Name=ViewPageLaunchGameResourceDiffHeader}"/>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</StackPanel> </StackPanel>
</Grid> </Grid>
</ScrollViewer> </ScrollViewer>