Skip to content

Commit

Permalink
Fixed scroll bars issues (#84)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Leo-Peyronnet
Leo-Peyronnet committed May 9, 2021
1 parent 43d1eb0 commit db66a6c
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 49 deletions.
10 changes: 6 additions & 4 deletions Gavilya/Pages/Statistics.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,13 @@
</ScrollViewer>
</Grid>



<Grid x:Name="GameInfoDisplayer" Grid.Column="1" Grid.RowSpan="2">
<uc:StatGameInfoControl Width="{Binding ActualWidth, ElementName=GameInfoDisplayer, Mode=OneWay}" Margin="10,0,0,0"></uc:StatGameInfoControl>
</Grid>

<ScrollViewer Grid.Column="1" Grid.RowSpan="2" Template="{DynamicResource ScrollViewerTemplate1}" HorizontalScrollBarVisibility="Disabled">
<Grid x:Name="GameInfoDisplayer" Grid.Column="1" Grid.RowSpan="2">
<uc:StatGameInfoControl Width="{Binding ActualWidth, ElementName=GameInfoDisplayer, Mode=OneWay}" Margin="10,0,0,0"></uc:StatGameInfoControl>
</Grid>
</ScrollViewer>

</Grid>
</Grid>
Expand Down
88 changes: 43 additions & 45 deletions Gavilya/UserControls/StatGameInfoControl.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,60 +8,58 @@
mc:Ignorable="d" Foreground="#fff"
FontFamily="..\Fonts\#Montserrat"
d:DesignHeight="500" d:DesignWidth="365">
<ScrollViewer Template="{DynamicResource ScrollViewerTemplate1}" HorizontalScrollBarVisibility="Hidden">
<Grid x:Name="ContentGrid" Width="{Binding ActualWidth, ElementName=userControl, Mode=OneWay}" >
<Grid x:Name="ContentGrid" Width="{Binding ActualWidth, ElementName=userControl, Mode=OneWay}" >
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition/>
<RowDefinition/>
</Grid.RowDefinitions>

<Border Grid.Row="0" Margin="10" CornerRadius="10">
<Border.Background>
<ImageBrush x:Name="BackgroundImage" Stretch="UniformToFill" Opacity="0.9"></ImageBrush>
</Border.Background>

<Grid Height="150">
<Grid.Background>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#E50A0A1E" Offset="0.95"/>
<GradientStop Color="#00000000" Offset="0"/>
</LinearGradientBrush>
</Grid.Background>
<TextBlock x:Name="GameNameTxt" Grid.Row="0" d:Text="GameName" Margin="5" FontSize="24" FontWeight="Bold" TextAlignment="Left" VerticalAlignment="Bottom"/>
</Grid>
</Border>
<Border Grid.Row="0" Margin="10" CornerRadius="10">
<Border.Background>
<ImageBrush x:Name="BackgroundImage" Stretch="UniformToFill" Opacity="0.9"></ImageBrush>
</Border.Background>

<Border Grid.Row="1" CornerRadius="10" Background="#FF28283C" Margin="10" Padding="10">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Grid Height="150">
<Grid.Background>
<LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
<GradientStop Color="#E50A0A1E" Offset="0.95"/>
<GradientStop Color="#00000000" Offset="0"/>
</LinearGradientBrush>
</Grid.Background>
<TextBlock x:Name="GameNameTxt" Grid.Row="0" d:Text="GameName" Margin="5" FontSize="24" FontWeight="Bold" TextAlignment="Left" VerticalAlignment="Bottom"/>
</Grid>
</Border>

<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock Text="{x:Static lang:Resources.StatsTimePlayed}" FontSize="14" FontWeight="Bold" Foreground="#FF64648C"/>
<TextBlock Text="{x:Static lang:Resources.StatsLastTimePlayed}" FontSize="14" FontWeight="Bold" Foreground="#FF64648C" Grid.Column="1"/>
<Border Grid.Row="1" CornerRadius="10" Background="#FF28283C" Margin="10" Padding="10">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>

<TextBlock x:Name="TotalTimePlayedTxt" d:Text="74,5h" Margin="0,10,10,10" FontSize="22" FontWeight="Bold" TextAlignment="Left" Grid.Column="0" Grid.Row="1"/>
<TextBlock x:Name="LastTimePlayedTxt" d:Text="10 December 2021" Margin="0,10,10,10" FontSize="22" FontWeight="Bold" TextAlignment="Left" Grid.Column="1" Grid.Row="1"/>
</Grid>
</Border>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
<RowDefinition/>
</Grid.RowDefinitions>
<TextBlock Text="{x:Static lang:Resources.StatsTimePlayed}" FontSize="14" FontWeight="Bold" Foreground="#FF64648C"/>
<TextBlock Text="{x:Static lang:Resources.StatsLastTimePlayed}" FontSize="14" FontWeight="Bold" Foreground="#FF64648C" Grid.Column="1"/>

<StackPanel Grid.Row="2" Orientation="Vertical" Margin="10">
<TextBlock Text="{x:Static lang:Resources.Description}" FontSize="18" FontWeight="Bold"/>
<TextBlock x:Name="DescriptionTxt" d:Text="{x:Static lang:Resources.Description}" FontSize="14" FontWeight="Normal" TextWrapping="Wrap"/>
</StackPanel>
</Grid>
<TextBlock x:Name="TotalTimePlayedTxt" d:Text="74,5h" Margin="0,10,10,10" FontSize="22" FontWeight="Bold" TextAlignment="Left" Grid.Column="0" Grid.Row="1"/>
<TextBlock x:Name="LastTimePlayedTxt" d:Text="10 December 2021" Margin="0,10,10,10" FontSize="22" FontWeight="Bold" TextAlignment="Left" Grid.Column="1" Grid.Row="1"/>
</Grid>
</Border>

<StackPanel Grid.Row="2" Orientation="Vertical" Margin="10">
<TextBlock Text="{x:Static lang:Resources.Description}" FontSize="18" FontWeight="Bold"/>
<TextBlock x:Name="DescriptionTxt" d:Text="{x:Static lang:Resources.Description}" FontSize="14" FontWeight="Normal" TextWrapping="Wrap"/>
</StackPanel>
</Grid>
</ScrollViewer>

</Grid>
</UserControl>

0 comments on commit db66a6c

Please sign in to comment.