Skip to content

Commit

Permalink
Update source files
Browse files Browse the repository at this point in the history
  • Loading branch information
@ld892012
ld892012 authored Jan 22, 2023
1 parent 224f20a commit 7aebf28
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 35 deletions.
24 changes: 21 additions & 3 deletions Revisited/Views/FiltersView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,27 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Filters}">
<StackPanel x:Name="PART_PanelItemsHost"
MinWidth="{DynamicResource FilterPanelWidth}"
Background="{DynamicResource OverlayMenuBackgroundBrush}" />
<Border Background="{DynamicResource OverlayMenuBackgroundBrush}"
MinWidth="{DynamicResource FilterPanelWidth}">
<ItemsControlEx x:Name="PART_ItemsHost" Focusable="False"
KeyboardNavigation.DirectionalNavigation="Once">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.Template>
<ControlTemplate>
<ScrollViewer Focusable="False"
HorizontalScrollBarVisibility="Disabled"
VerticalScrollBarVisibility="Auto"
CanContentScroll="True">
<ItemsPresenter />
</ScrollViewer>
</ControlTemplate>
</ItemsControl.Template>
</ItemsControlEx>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
Expand Down
10 changes: 5 additions & 5 deletions Revisited/Views/GameDetails.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
RenderingBias="Quality" Opacity="1"/>
</TextBlock.Effect>
<TextBlock.Style>
<Style>
<Style TargetType="TextBlock" BasedOn="{StaticResource TextBlockBaseStyle}">
<Setter Property="ItemsControl.Visibility" Value="Visible" />
<Style.Triggers>
<DataTrigger Binding="{Settings FullscreenItemSpacingMargin}" Value="0,0,0,0">
Expand Down Expand Up @@ -93,14 +93,14 @@
<RowDefinition Height="50" />
</Grid.RowDefinitions>

<ScrollViewerEx DockPanel.Dock="Top" Grid.Row="1" Grid.Column="3" HorizontalAlignment="Center" VerticalAlignment="Top" x:Name="Description"
Margin="0,110,0,0" Grid.ColumnSpan="2" Grid.RowSpan="2" HorizontalContentAlignment="Center">
<ScrollViewerEx DockPanel.Dock="Top" Grid.Row="1" Grid.Column="3" HorizontalAlignment="Left" VerticalAlignment="Top" x:Name="Description"
Margin="0,110,0,0" Grid.RowSpan="2" HorizontalContentAlignment="Left" >
<HtmlTextView x:Name="PART_HtmlDescription"
HtmlFontSize="22"
HtmlFontSize="22" Margin="20,0,10,0"
HtmlForeground="{DynamicResource TextColor}"
LinkForeground="{DynamicResource GlyphColor}"
FocusVisualStyle="{x:Null}" Focusable="True" Visibility="Visible"
ScrollViewer.VerticalScrollBarVisibility="Auto"/>
ScrollViewer.VerticalScrollBarVisibility="Auto" HorizontalAlignment="Left" VerticalAlignment="Top"/>
</ScrollViewerEx>

<TextBlock Style="{DynamicResource TextBlockBaseStyle}"
Expand Down
63 changes: 37 additions & 26 deletions Revisited/Views/Main.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
</Grid.ColumnDefinitions>

<FilterPresetSelector x:Name="PART_FilterPresetSelector" Grid.Column="1" Margin="0,0,50,0" />

<ContentControl x:Name="PART_ElemBatteryStatus" Focusable="False" FontSize="42"
VerticalAlignment="Center" Margin="10,0,10,0"
Grid.Column="2">
Expand Down Expand Up @@ -123,34 +123,42 @@

<TextBlock x:Name="PART_TextClock" Style="{DynamicResource TextBlockBaseStyle}" FontWeight="Bold" FontSize="48" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Top"/>

<StackPanel Grid.Column="2" x:Name="PART_ElemSearchActive"
<Grid Grid.Column="2" Grid.Row="0" HorizontalAlignment="Left" VerticalAlignment="Bottom">
<Grid.RowDefinitions>
<RowDefinition Height="70" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<StackPanel Grid.Row="0" x:Name="PART_ElemSearchActive"
VerticalAlignment="Stretch" HorizontalAlignment="Left">
<TextBlock FontSize="18"
<TextBlock FontSize="18"
TextAlignment="Center"
Style="{DynamicResource TextBlockBaseStyle}"
Text="{DynamicResource LOCGameListSearchResults}"/>
<TextBlock Foreground="White"
<TextBlock Foreground="White"
TextAlignment="Center"
Style="{DynamicResource TextBlockBaseStyle}"
Text="{Binding AppSettings.Fullscreen.FilterSettings.Name}"/>
</StackPanel>
</StackPanel>

<TextBlock Grid.Column="2" x:Name="PART_ElemExtraFilterActive"
<TextBlock Grid.Row="0" x:Name="PART_ElemExtraFilterActive"
FontSize="20"
VerticalAlignment="Center" HorizontalAlignment="Left"
TextAlignment="Center"
Style="{DynamicResource TextBlockBaseStyle}"
Text="{DynamicResource LOCGameListExtraFiltered}"/>

</Grid>

<StackPanel x:Name="PART_ElemProgressIndicator" Orientation="Horizontal" HorizontalAlignment="Right" VerticalAlignment="Top" Grid.Row="1" Margin="0,0,100,0">
<TextBlock x:Name="PART_TextProgressTooltip"
<StackPanel x:Name="PART_ElemProgressIndicator" Grid.Row="1" Orientation="Horizontal" HorizontalAlignment="Left" VerticalAlignment="Center" Height="70" >
<TextBlock x:Name="PART_TextProgressTooltip"
Margin="0,0,15,0" FontSize="20" VerticalAlignment="Center"
Style="{DynamicResource TextBlockBaseStyle}"/>
<ContentControl Style="{DynamicResource ProgressIndicator}" Focusable="False"
Height="38" Width="38" VerticalAlignment="Center"/>
</StackPanel>
<ContentControl Style="{DynamicResource ProgressIndicator}" Focusable="False"
Height="38" Width="38" VerticalAlignment="Center"/>
</StackPanel>
</Grid>


</Grid>

<DockPanel Grid.Row="1">
<Filters x:Name="PART_ElemFilters"
Expand Down Expand Up @@ -193,31 +201,34 @@
</TextBlock>

<StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Bottom" HorizontalAlignment="Right">
<!--Install-->
<ButtonEx x:Name="PART_ButtonInstall"
<StackPanel.Effect>
<DropShadowEffect Opacity="1" BlurRadius="20" ShadowDepth="0" Direction="0"/>
</StackPanel.Effect>
<!--Install-->
<ButtonEx x:Name="PART_ButtonInstall"
Style="{DynamicResource ButtonBottomMenu}"
Content="{DynamicResource LOCInstallGame}" />
<!--Play-->
<ButtonEx x:Name="PART_ButtonPlay"
<!--Play-->
<ButtonEx x:Name="PART_ButtonPlay"
Style="{DynamicResource ButtonBottomMenu}"
Content="{DynamicResource LOCPlayGame}" />
<!--Details-->
<ButtonEx x:Name="PART_ButtonDetails"
<!--Details-->
<ButtonEx x:Name="PART_ButtonDetails"
Style="{DynamicResource ButtonBottomMenu}"
Content="{DynamicResource LOCGameDetails}" />
<!--Options-->
<ButtonEx x:Name="PART_ButtonGameOptions"
<!--Options-->
<ButtonEx x:Name="PART_ButtonGameOptions"
Style="{DynamicResource ButtonBottomMenu}"
Content="{DynamicResource LOCGameOptions}" />
<!--Search-->
<ButtonEx x:Name="PART_ButtonSearch"
<!--Search-->
<ButtonEx x:Name="PART_ButtonSearch"
Style="{DynamicResource ButtonBottomMenu}"
Content="{DynamicResource LOCSearchLabel}" />
<!--Filter-->
<ButtonEx x:Name="PART_ButtonFilter"
<!--Filter-->
<ButtonEx x:Name="PART_ButtonFilter"
Style="{DynamicResource ButtonBottomMenu}"
Content="{DynamicResource LOCFilter}" />
</StackPanel>
</StackPanel>
</Grid>

<GameDetails x:Name="PART_ElemGameDetails" Grid.RowSpan="3"
Expand Down
2 changes: 1 addition & 1 deletion Revisited/theme.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ Mode: Fullscreen
Id: Revisited_75824c9b-aa0e-43ad-a98c-9b4c44f07848
Name: Revisited
Author: ld892012
Version: 1.7.1
Version: 1.7.2

0 comments on commit 7aebf28

Please sign in to comment.