Revert "Add ScoreImagePad ."

This reverts commit 83872bd.
hyvart · Nov 26, 2019 · 2d63f2f · 2d63f2f
1 parent 83872bd
commit 2d63f2f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/Forms/Views/SongPage.xaml b/Forms/Views/SongPage.xaml
@@ -27,7 +27,6 @@
       <x:Double x:Key="ScoreHeight">1024</x:Double>
       <x:Double x:Key="ScoreWidth">724</x:Double>
       <x:Double x:Key="ScoreCursorOffset">-352</x:Double><!-- ScoreWidth/2 - 20 -->
-      <x:Double x:Key="ScoreHeightX2">2048</x:Double>
     </ResourceDictionary>
   </ContentPage.Resources>
 
@@ -43,22 +42,15 @@
 
     <ScrollView x:Name="ScoreLayout" BackgroundColor="LightGray" Padding="0">
       <RelativeLayout
-        HeightRequest="{StaticResource Key=ScoreHeightX2}"
-        MinimumHeightRequest="{StaticResource Key=ScoreHeightX2}"
+        HeightRequest="{StaticResource Key=ScoreHeight}"
+        MinimumHeightRequest="{StaticResource Key=ScoreHeight}"
         WidthRequest="{StaticResource Key=ScoreWidth}"
         MinimumWidthRequest="{StaticResource Key=ScoreWidth}"
         VerticalOptions="FillAndExpand" HorizontalOptions="FillAndExpand">
         <Image x:Name="ScoreImage"
                Aspect="AspectFit"
                RelativeLayout.YConstraint="{ConstraintExpression Type=Constant, Constant=0}"
-               RelativeLayout.HeightConstraint="{ConstraintExpression Type=Constant, Constant={StaticResource Key=ScoreHeight}}"
-               RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width}"
-               />
-
-        <Image x:Name="ScoreImagePad"
-               Aspect="AspectFit"
-               RelativeLayout.YConstraint="{ConstraintExpression Type=Constant, Constant={StaticResource Key=ScoreHeight}}"
-               RelativeLayout.HeightConstraint="{ConstraintExpression Type=Constant, Constant={StaticResource Key=ScoreHeight}}"
+               RelativeLayout.HeightConstraint="{ConstraintExpression Type=RelativeToParent, Property=Height}"
                RelativeLayout.WidthConstraint="{ConstraintExpression Type=RelativeToParent, Property=Width}"
                />
 

diff --git a/Forms/Views/SongPage.xaml.cs b/Forms/Views/SongPage.xaml.cs
@@ -327,13 +327,6 @@ void SetScorePage(uint index)
       {
         return App.MediaLoader.LoadNotation(Media, score, index);
       });
-      if (index + 1 < score.PageCount)
-      {
-        ScoreImagePad.Source = ImageSource.FromStream(() =>
-        {
-          return App.MediaLoader.LoadNotation(Media, score, index + 1);
-        });
-      }
     }
 
     private void BackButton_Clicked(object sender, EventArgs e)