Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions source/Constants.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,11 +61,11 @@
<sys:Double x:Key="BackgroundImageNoiseBackgroundOpacity">0.015</sys:Double>
<FontFamily x:Key="FontFamily">Segoe UI</FontFamily>
<FontFamily x:Key="MonospaceFontFamily">Consolas</FontFamily>
<Thickness x:Key="PopupMenuPadding">0,10,0,10</Thickness>
<Thickness x:Key="PopupMenuPadding">0</Thickness>
<Thickness x:Key="PopupBorderThickness">1</Thickness>
<Thickness x:Key="ControlBorderThickness">0</Thickness>
<sys:Double x:Key="EllipseBorderThickness">1</sys:Double>
<sys:Double x:Key="ControlCornerRadiusValue">3</sys:Double>
<sys:Double x:Key="ControlCornerRadiusValue">0</sys:Double>
<CornerRadius x:Key="ControlCornerRadius"
TopLeft="{StaticResource ControlCornerRadiusValue}"
TopRight="{StaticResource ControlCornerRadiusValue}"
Expand Down Expand Up @@ -113,7 +113,7 @@
<Color x:Key="PopupBorderColor">#63676869</Color>
<Color x:Key="BackgroundToneColor">#262c38</Color>
<Color x:Key="GridItemBackgroundColor">Transparent</Color>
<Color x:Key="PopupSeparatorColor">#5f6062</Color>
<Color x:Key="PopupSeparatorColor">#282a2e</Color>
<Color x:Key="PanelSeparatorColor">#24262a</Color>
<Color x:Key="WindowPanelSeparatorColor">Transparent</Color>

Expand Down
2 changes: 1 addition & 1 deletion source/DefaultControls/ListView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
<Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}" />
<Setter Property="VerticalContentAlignment" Value="Center"/>
<Setter Property="Padding" Value="0,1,0,1" />
<Setter Property="Padding" Value="0,9,0,9" />
<Setter Property="Cursor" Value="Hand"/>
<Setter Property="Template">
<Setter.Value>
Expand Down
10 changes: 5 additions & 5 deletions source/DefaultControls/Menu.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<Border x:Name="Border">
<Grid>
<Border x:Name="HoverBorder" Background="{DynamicResource HoverBrush}" Visibility="Collapsed" />
<TextBlock VerticalAlignment="Center" Padding="5" Style="{DynamicResource BaseTextBlockStyle}"
<TextBlock VerticalAlignment="Center" Padding="6" Style="{DynamicResource BaseTextBlockStyle}"
Foreground="{TemplateBinding Foreground}">
<ContentPresenter ContentSource="Header" RecognizesAccessKey="True" />
</TextBlock>
Expand Down Expand Up @@ -115,14 +115,14 @@
</Grid.ColumnDefinitions>
<Border x:Name="HoverBorder" Grid.Column="0" Grid.ColumnSpan="4"
Background="{DynamicResource HoverBrush}" Visibility="Collapsed" />
<ContentPresenter x:Name="Icon" Grid.Column="0" Margin="4,0,-5,0"
<ContentPresenter x:Name="Icon" Grid.Column="0" Margin="10,0,0,0"
MaxHeight="16" MaxWidth="16"
VerticalAlignment="Center" ContentSource="Icon" />
<Grid x:Name="GlyphPanel" Grid.Column="0" Visibility="Collapsed"
Margin="5,0,-5,0" VerticalAlignment="Center">
<TextBlock FontFamily="Marlett" Text="a" VerticalAlignment="Center" Style="{DynamicResource BaseTextBlockStyle}" />
</Grid>
<TextBlock Grid.Column="1" Padding="5" VerticalAlignment="Center" Style="{DynamicResource BaseTextBlockStyle}"
<TextBlock Grid.Column="1" Padding="6" VerticalAlignment="Center" Style="{DynamicResource BaseTextBlockStyle}"
Foreground="{TemplateBinding Foreground}">
<ContentPresenter RecognizesAccessKey="True" Margin="5,0,5,0" ContentSource="Header"/>
</TextBlock>
Expand Down Expand Up @@ -177,13 +177,13 @@
<ColumnDefinition Width="*" SharedSizeGroup="MenuItemIGTColumnGroup" />
<ColumnDefinition Width="Auto" SharedSizeGroup="MenuItemShortcutColumnGroup" />
</Grid.ColumnDefinitions>
<ContentPresenter x:Name="Icon" Grid.Column="0" Margin="4,0,-5,0"
<ContentPresenter x:Name="Icon" Grid.Column="0" Margin="10,0,-5,0"
MaxHeight="16" MaxWidth="16"
VerticalAlignment="Center" ContentSource="Icon" />
<Grid x:Name="GlyphPanel" Grid.Column="0" Visibility="Collapsed" Margin="5,0,-5,0" VerticalAlignment="Center">
<TextBlock FontFamily="Marlett" Text="a" VerticalAlignment="Center" Style="{DynamicResource BaseTextBlockStyle}" />
</Grid>
<TextBlock VerticalAlignment="Center" Grid.Column="1" Margin="5,0,5,0" Padding="5" Style="{DynamicResource BaseTextBlockStyle}"
<TextBlock VerticalAlignment="Center" Grid.Column="1" Margin="5,0,15,0" Padding="6" Style="{DynamicResource BaseTextBlockStyle}"
Foreground="{TemplateBinding Foreground}">
<ContentPresenter RecognizesAccessKey="True" ContentSource="Header"/>
</TextBlock>
Expand Down
1 change: 0 additions & 1 deletion source/DefaultControls/TabControl.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@
<Border x:Name="HeaderBorder" Background="Transparent"
BorderThickness="0,0,0,0">
<TabPanel x:Name="HeaderPanel" IsItemsHost="True" Panel.ZIndex="1" Width="Auto" Height="Auto"
HorizontalAlignment="Center"
KeyboardNavigation.TabIndex="1" RenderTransformOrigin="0.5,0.5">
<TabPanel.LayoutTransform>
<TransformGroup>
Expand Down
2 changes: 1 addition & 1 deletion source/DerivedStyles/DetailsScrollViewer.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
Margin="-17,0,0,0"/>

<ScrollBar x:Name="PART_VerticalScrollBar" Grid.Column="1" Grid.Row="0"
Margin="-17,0,0,0"
Margin="-17,10,2,10"
Visibility="{TemplateBinding ComputedVerticalScrollBarVisibility}"
Value="{Binding Path=VerticalOffset, Mode=OneWay, RelativeSource={RelativeSource TemplatedParent}}"
ViewportSize="{TemplateBinding ViewportHeight}"
Expand Down
6 changes: 5 additions & 1 deletion source/DerivedStyles/DetailsViewItemStyle.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@
<Setter Property="OverridesDefaultStyle" Value="True" />
<Setter Property="FocusVisualStyle" Value="{x:Null}" />
<Setter Property="FontSize" Value="{DynamicResource FontSize}" />
<Setter Property="Padding" Value="{DynamicResource FontSize}" />
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type ListBoxItem}">
<Grid>
<Grid Margin="10,0,10,0">
<Border x:Name="HoverRectangle" IsHitTestVisible="False" Visibility="Collapsed"
BorderThickness="5,0,0,0" BorderBrush="{DynamicResource SecondaryBrush}"/>
<Border x:Name="SelectedRectangle" IsHitTestVisible="False" Visibility="Collapsed"
BorderThickness="0,0,0,0" BorderBrush="{DynamicResource GlyphBrush}"/>
<Border x:Name="ItemBackground" Padding="{TemplateBinding Padding}" Background="Transparent"
Expand Down Expand Up @@ -40,6 +43,7 @@
<Setter Property="Background" Value="{DynamicResource DetailsViewLibrarySelectedBackgroundBrush}" TargetName="ItemBackground" />
<Setter Property="BorderBrush" Value="{DynamicResource GlyphBrush}" TargetName="SelectedRectangle" />
<Setter Property="Visibility" Value="Visible" TargetName="SelectedRectangle" />
<Setter Property="Visibility" Value="Visible" TargetName="HoverRectangle" />
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
Expand Down
5 changes: 3 additions & 2 deletions source/DerivedStyles/DetailsViewItemTemplate.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,15 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type GameListItem}">
<Border Name="PART_PanelHost" Padding="10,3,0,3" Background="Transparent"
<Border Name="PART_PanelHost" Padding="11,5,0,5" Background="Transparent"
d:DataContext="{x:Static DesignMainViewModel.DesignSelectedGameIntance}">
<DockPanel>
<TextBlock Text="&#xF000;" Foreground="{DynamicResource GlyphBrush}"
Margin="3,0,6,0"
VerticalAlignment="Center"
DockPanel.Dock="Right"
FontFamily="{DynamicResource FontIcoFont}"
Padding="0,0,20,0"
Tag="{DynamicResource DetailsViewLibraryGameShowFavorite}">
<TextBlock.Style>
<Style TargetType="TextBlock" >
Expand Down Expand Up @@ -46,7 +47,7 @@
RenderOptions.BitmapScalingMode="Fant"
DockPanel.Dock="Left" Margin="0,0,8,0" />
<TextBlock Text="{Binding DisplayName}" TextTrimming="CharacterEllipsis" x:Name="DisplayName"
VerticalAlignment="Center" DockPanel.Dock="Left">
VerticalAlignment="Center" DockPanel.Dock="Left" Padding="0,0,10,0">
</TextBlock>
</DockPanel>
</Border>
Expand Down
2 changes: 1 addition & 1 deletion source/DerivedStyles/MainWindowStyle.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<Setter Property="WindowChrome.WindowChrome">
<Setter.Value>
<WindowChrome CaptionHeight="25" CornerRadius="0" ResizeBorderThickness="4"
NonClientFrameEdges ="None" UseAeroCaptionButtons="False" GlassFrameThickness="0"/>
NonClientFrameEdges ="None" UseAeroCaptionButtons="False" GlassFrameThickness="1"/>
</Setter.Value>
</Setter>
<Setter Property="Template">
Expand Down
2 changes: 1 addition & 1 deletion source/DerivedStyles/StandardWindowStyle.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<Border Background="{DynamicResource NoiseBrush}"
CornerRadius="8"
Opacity="{DynamicResource StandardWindowNoiseBackgroundOpacity}"/>
<ContentPresenter Margin="0,50,0,0"/>
<ContentPresenter Margin="10,50,10,10"/>
<DockPanel DockPanel.Dock="Top" LastChildFill="False">
<DockPanel DockPanel.Dock="Top" LastChildFill="False">
<TextBlock Text="{TemplateBinding Title}" FontWeight="SemiBold" DockPanel.Dock="Left" Margin="10,15,0,15" VerticalAlignment="Center"
Expand Down
2 changes: 1 addition & 1 deletion source/LocSource.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -923,7 +923,7 @@ Application restart is requred to finish the process. Do you want to reset setti
<sys:String x:Key="LOCItemAlreadyExists">An item with the same name already exists.</sys:String>
<sys:String x:Key="LOCRandomGameLimistToFilter">Limit selection to current filter</sys:String>
<sys:String x:Key="LOCRandomGamePickAnother">Pick another</sys:String>
<sys:String x:Key="LOCMenuAddons">Add-ons</sys:String>
<sys:String x:Key="LOCMenuAddons">Add-ons</sys:String>
<sys:String x:Key="LOCExtensionsInstalled">Installed</sys:String>
<sys:String x:Key="LOCExtensionsSettings">Extensions settings</sys:String>
<sys:String x:Key="LOCExtensionsBrowse">Browse</sys:String>
Expand Down
Loading