From 3364801221aa9d3f52202cb6be8b9424713197a3 Mon Sep 17 00:00:00 2001
From: DrabWeb <sethunity@gmail.com>
Date: Thu, 23 Mar 2017 08:32:24 -0300
Subject: [PATCH] Fix for the fix

---
 osu.Game/Screens/Play/SongProgress.cs      | 4 ++--
 osu.Game/Screens/Play/SongProgressGraph.cs | 5 ++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index 8ab5492179..13219323f4 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -93,14 +93,14 @@ namespace osu.Game.Screens.Play
             bar.IsEnabled = true;
             updateProgress(); //in case progress was changed while the bar was hidden
 
-            bar.FadeTo(1f, transition_duration, EasingTypes.In);
+            bar.FadeIn(transition_duration, EasingTypes.In);
             MoveTo(Vector2.Zero, transition_duration, EasingTypes.In);
         }
 
         protected override void PopOut()
         {
             bar.IsEnabled = false;
-            bar.FadeTo(0f, transition_duration, EasingTypes.In);
+            bar.FadeOut(transition_duration, EasingTypes.In);
             MoveTo(new Vector2(0f, bar_height), transition_duration, EasingTypes.In);
         }
     }
diff --git a/osu.Game/Screens/Play/SongProgressGraph.cs b/osu.Game/Screens/Play/SongProgressGraph.cs
index e3d6aa785e..45da103d6a 100644
--- a/osu.Game/Screens/Play/SongProgressGraph.cs
+++ b/osu.Game/Screens/Play/SongProgressGraph.cs
@@ -151,7 +151,7 @@ namespace osu.Game.Screens.Play
             private const float cube_size = 4;
             private const float padding = 2;
             public const float WIDTH = cube_size + padding;
-            public const float HEIGHT = cube_count * WIDTH;
+            public const float HEIGHT = (cube_count * WIDTH) + padding + 1;
 
             private readonly List<Box> drawableRows = new List<Box>();
 
@@ -184,7 +184,6 @@ namespace osu.Game.Screens.Play
             public Column()
             {
                 Size = new Vector2(WIDTH, HEIGHT);
-                Margin = new MarginPadding { Bottom = 1 }; //todo: probably find a better fix, not quite sure why this works
 
                 for (int r = 0; r < cube_count; r++)
                 {
@@ -192,7 +191,7 @@ namespace osu.Game.Screens.Play
                     {
                         EdgeSmoothness = new Vector2(padding / 4),
                         Size = new Vector2(cube_size),
-                        Position = new Vector2(0, r * WIDTH),
+                        Position = new Vector2(0, r * WIDTH + padding),
                     });
 
                     Add(drawableRows[drawableRows.Count - 1]);