Skip to content

Commit

Permalink
Update 2.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@Deytron
Deytron committed May 8, 2020
1 parent 3246e0e commit 06b3cd9
Show file tree
Hide file tree
Showing 17 changed files with 219 additions and 81 deletions.
35 changes: 34 additions & 1 deletion DefaultControls/Button.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,38 @@
<Setter Property="Foreground" Value="White" />
</Trigger>
</Style.Triggers>
</Style>
</Style>

<Style x:Key="ButtonGameEdit" TargetType="{x:Type Button}" BasedOn="{StaticResource BaseStyle}">
<Setter Property="Background" Value="#BF3c3f47"/>
<Setter Property="Foreground" Value="{DynamicResource GlyphBrush}" />
<Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
<Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
<Setter Property="SnapsToDevicePixels" Value="True" />
<Setter Property="Padding" Value="0" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border x:Name="Border" BorderThickness="0" Background="{TemplateBinding Background}"
CornerRadius="5" Style="{DynamicResource HighlightBorder}">
<ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" />
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsFocused" Value="True">
<Setter Property="Background" Value="#4a4e56"/>
<Setter Property="Opacity" Value="1"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#4a4e56"/>
<Setter Property="Opacity" Value="1"/>
</Trigger>
</Style.Triggers>
</Style>
</ResourceDictionary>
5 changes: 3 additions & 2 deletions DefaultControls/ListView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,8 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListViewItem}">
<Grid>
<Rectangle x:Name="HoverRectangle" Visibility="Collapsed" Fill="{DynamicResource HoverBrush}" />
<Rectangle x:Name="SelectedRectangle" Visibility="Collapsed" Fill="{DynamicResource GlyphBrush}" />
<Rectangle x:Name="HoverRectangle" Visibility="Collapsed" Fill="#2f3036" />
<Rectangle x:Name="SelectedRectangle" Visibility="Collapsed" Fill="#5d6c95" />
<Border Padding="{TemplateBinding Padding}" Background="Transparent">
<GridViewRowPresenter SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="Stretch" />
</Border>
Expand All @@ -136,6 +136,7 @@
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Visibility" Value="Visible" TargetName="HoverRectangle" />
<Setter Property="Cursor" Value="Hand"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
Expand Down
15 changes: 6 additions & 9 deletions DerivedStyles/DetailsViewItemStyle.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,16 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">

<Style x:Key="DetailsViewItemStyle" TargetType="{x:Type ListBoxItem}">
<Setter Property="Foreground" Value="{DynamicResource TextBrushDarker}" />
<Setter Property="Foreground" Value="White" />
<Setter Property="OverridesDefaultStyle" Value="True" />
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="FontSize" Value="{DynamicResource FontSize}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListBoxItem}">
<Grid>
<Border x:Name="SelectedRectangle" IsHitTestVisible="False" Visibility="Collapsed"
BorderThickness="500,0,0,0" BorderBrush="#5d6c95"/>
<Border x:Name="HoverRectangle" IsHitTestVisible="False" Visibility="Collapsed"
BorderThickness="500,0,0,0" BorderBrush="#2f3036"/>
<Rectangle x:Name="HoverRectangle" Visibility="Collapsed" Fill="#2f3036" />
<Rectangle x:Name="SelectedRectangle" Visibility="Collapsed" Fill="#5d6c95" />
<Border Padding="{TemplateBinding Padding}" Background="Transparent">
<ContentPresenter />
</Border>
Expand All @@ -24,14 +22,13 @@
</DataTrigger>
<DataTrigger Binding="{Binding IsInstalled}" Value="False">
<Setter Property="Foreground" Value="{StaticResource TextBrushDarker}" />
</DataTrigger>
<Trigger Property="IsSelected" Value="True">
</DataTrigger>
<Trigger Property="Selector.IsSelected" Value="True">
<Setter Property="Visibility" Value="Visible" TargetName="SelectedRectangle" />
<Setter Property="Foreground" Value="White" />
</Trigger>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Visibility" Value="Visible" TargetName="HoverRectangle" />
<Setter Property="Foreground" Value="White" />
<Setter Property="Cursor" Value="Hand"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
Expand Down
4 changes: 2 additions & 2 deletions DerivedStyles/GridViewItemTemplate.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type GameListItem}">
<Border BorderThickness="{Settings GridItemMargin}" BorderBrush="Transparent">
<Border BorderThickness="{Settings GridItemMargin}" BorderBrush="Transparent" Cursor="Hand">
<StackPanel Name="PART_PanelHost"
d:DataContext="{x:Static DesignMainViewModel.DesignSelectedGameIntance}">

Expand All @@ -49,7 +49,7 @@
TextTrimming="CharacterEllipsis" TextAlignment="Center"
HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border>
<Border Background="#0EFFFFFF" x:Name="BorderMouseOver" Visibility="Collapsed" />
<Border Background="#1DFFFFFF" x:Name="BorderMouseOver" Visibility="Collapsed" />
<Border Background="#AA000000" x:Name="BorderDarken" Visibility="Collapsed" />
<Viewbox Name="GameControls" Visibility="Collapsed">
<StackPanel Width="200" Height="267">
Expand Down
19 changes: 18 additions & 1 deletion DerivedStyles/HighlightBorder.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,22 @@
<Setter Property="BorderBrush" Value="{DynamicResource GlyphBrush}" />
</Trigger>
</Style.Triggers>
</Style>
</Style>

<Style x:Key="HighlightBackground" TargetType="Border" BasedOn="{StaticResource {x:Type Border}}">
<Setter Property="Background" Value="#3F000000"/>
<Setter Property="CornerRadius" Value="{DynamicResource ControlCornerRadius}" />
<Setter Property="BorderThickness" Value="{DynamicResource ControlBorderThickness}" />
<Setter Property="BorderBrush" Value="{DynamicResource NormalBorderBrush}" />
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Background" Value="#3e4047" />
</Trigger>
<Trigger Property="IsFocused" Value="True">
<Setter Property="Background" Value="#3e4047" />
</Trigger>
</Style.Triggers>
</Style>


</ResourceDictionary>
1 change: 1 addition & 0 deletions DerivedStyles/PlayButton.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

<Style x:Key="PlayButton" TargetType="{x:Type Button}" BasedOn="{StaticResource BaseStyle}">
<Setter Property="FontFamily" Value="Corbel"/>
<Setter Property="Cursor" Value="Hand"/>
<Setter Property="Typography.Capitals" Value="AllSmallCaps"/>
<Setter Property="FontSize" Value="25"/>
<Setter Property="Width" Value="Auto"/>
Expand Down
Binary file added Images/info.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/infohovered.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/settings.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Images/settingshovered.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
45 changes: 41 additions & 4 deletions Views/DetailsViewGameOverview.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<Grid.RowDefinitions>
<RowDefinition Height="530"/>
<RowDefinition Height="599*"/>
<RowDefinition Height="661*"/>
<RowDefinition Height="561*"/>
</Grid.RowDefinitions>
<FadeImage x:Name="PART_ImageBackground" Stretch="UniformToFill" HorizontalAlignment="Stretch" VerticalAlignment="Top">
<FadeImage.ImageOpacityMask>
Expand Down Expand Up @@ -53,7 +53,7 @@
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Button Grid.Column="0" Name="PART_ButtonPlayAction"
<Button Grid.Column="0" Name="PART_ButtonPlayAction" Cursor="Hand"
HorizontalAlignment="Left" Style="{DynamicResource PlayButton}" Margin="0,15,0,0"/>
<Button Grid.Column="0" Name="PART_ButtonContextAction"
HorizontalAlignment="Left" Style="{DynamicResource ContextButton}" Margin="0,15,0,0"/>
Expand Down Expand Up @@ -176,8 +176,45 @@
</StackPanel>
</DockPanel>
</Grid>
<Button x:Name="PART_ButtonMoreActions" Content="ⓘ" FontSize="25" Padding="0,0,0,0" Width="35" Height="35" Margin="0,450,20,0" HorizontalAlignment="Right"/>
<Button x:Name="PART_ButtonEditGame" Content="⚙" FontSize="18" Width="35" Height="35" Margin="0,450,70,0" Padding="0,0,0,0" HorizontalAlignment="Right"/>
<StackPanel Width="Auto" Orientation="Horizontal" Margin="0,0,20,0" HorizontalAlignment="Stretch" FlowDirection="RightToLeft">
<Button Style="{DynamicResource ButtonGameEdit}" x:Name="PART_ButtonMoreActions" Opacity="0.85" Padding="0" Width="35" Height="35" Margin="0,450,10,0" Cursor="Hand">
<Button.Content>
<Image Width="20" RenderOptions.BitmapScalingMode="NearestNeighbor">
<Image.Style>
<Style TargetType="Image">
<Setter Property="Source" Value="../Images/info.png"/>
<Setter Property="Opacity" Value="0.75"/>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Source" Value="../Images/infohovered.png"/>
<Setter Property="Opacity" Value="1"/>
</Trigger>
</Style.Triggers>
</Style>
</Image.Style>
</Image>
</Button.Content>
</Button>
<Button Style="{DynamicResource ButtonGameEdit}" x:Name="PART_ButtonEditGame" Opacity="0.85" Focusable="False" FontSize="18" Width="35" Height="35" Margin="0,450,0,0" Padding="0" Cursor="Hand">
<Button.Content>
<Image Height="20" Width="18">
<Image.Style>
<Style TargetType="Image">
<Setter Property="Source" Value="../Images/settings.png"/>
<Setter Property="Opacity" Value="0.75"/>
<Style.Triggers>
<Trigger Property="IsMouseOver" Value="True">
<Setter Property="Source" Value="../Images/settingshovered.png"/>
<Setter Property="Opacity" Value="1"/>
</Trigger>
</Style.Triggers>
</Style>
</Image.Style>
</Image>
</Button.Content>
</Button>
<Canvas Width="700"/>
</StackPanel>
</Grid>
</ScrollViewer>
</ControlTemplate>
Expand Down
4 changes: 2 additions & 2 deletions Views/ExplorerPanel.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
</Style>
</Border.Style>
<DockPanel Background="#24282f">
<ComboBox Name="PART_SelectFields"
<ComboBox Name="PART_SelectFields" Cursor="Hand"
DockPanel.Dock="Top" Margin="5,8,5,8" />
<ListBox Name="PART_SelectItems"
<ListBox Name="PART_SelectItems" Cursor="Hand"
DockPanel.Dock="Top" Margin="5,0,5,8"
BorderThickness="0"
ScrollViewer.HorizontalScrollBarVisibility="Disabled">
Expand Down
Loading

0 comments on commit 06b3cd9

Please sign in to comment.