From 0264c44a2094eb3d500186ff277d826ef2895e3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas94@gmx.net>
Date: Thu, 23 Feb 2017 22:33:37 +0100
Subject: [PATCH] Do not shadow Colour in TwoLayerButton

Renames Colour to BackgroundColour instead.
---
 osu.Game/Graphics/UserInterface/BackButton.cs     | 2 +-
 osu.Game/Graphics/UserInterface/TwoLayerButton.cs | 2 +-
 osu.Game/Screens/Play/SkipButton.cs               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/UserInterface/BackButton.cs b/osu.Game/Graphics/UserInterface/BackButton.cs
index fa66527195..8f5f674d94 100644
--- a/osu.Game/Graphics/UserInterface/BackButton.cs
+++ b/osu.Game/Graphics/UserInterface/BackButton.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Graphics.UserInterface
         private void load(AudioManager audio, OsuColour colours)
         {
             ActivationSound = audio.Sample.Get(@"Menu/menuback");
-            Colour = colours.Pink;
+            BackgroundColour = colours.Pink;
             HoverColour = colours.PinkDark;
         }
     }
diff --git a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
index 294d8533e4..cae2431898 100644
--- a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
+++ b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Graphics.UserInterface
         private Container c1;
         private Container c2;
 
-        public Color4 Colour
+        public Color4 BackgroundColour
         {
             set
             {
diff --git a/osu.Game/Screens/Play/SkipButton.cs b/osu.Game/Screens/Play/SkipButton.cs
index 6eda464885..f57bbd4cb0 100644
--- a/osu.Game/Screens/Play/SkipButton.cs
+++ b/osu.Game/Screens/Play/SkipButton.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Screens.Play
         private void load(AudioManager audio, OsuColour colours)
         {
             ActivationSound = audio.Sample.Get(@"Menu/menuhit");
-            Colour = colours.Yellow;
+            BackgroundColour = colours.Yellow;
             HoverColour = colours.YellowDark;
         }