From 50158a1cd2b95f33319b9515e70cc9bd78364cf7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas94@gmx.net>
Date: Sat, 3 Jun 2017 16:34:00 +0200
Subject: [PATCH] Fix incorrect proportions of menu cursor

---
 osu-framework                          | 2 +-
 osu.Game/Graphics/Cursor/MenuCursor.cs | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/osu-framework b/osu-framework
index e5f0cf73c1..8e1aa80d64 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit e5f0cf73c1e0bbcbd04194bf175d73af47fc850a
+Subproject commit 8e1aa80d64094f9c2590278b990ba17c2fb38f0b
diff --git a/osu.Game/Graphics/Cursor/MenuCursor.cs b/osu.Game/Graphics/Cursor/MenuCursor.cs
index b48ab879a6..82ae424ab0 100644
--- a/osu.Game/Graphics/Cursor/MenuCursor.cs
+++ b/osu.Game/Graphics/Cursor/MenuCursor.cs
@@ -93,6 +93,7 @@ namespace osu.Game.Graphics.Cursor
         {
             private Container cursorContainer;
             private Bindable<double> cursorScale;
+            private const float base_scale = 0.15f;
 
             public Sprite AdditiveLayer;
 
@@ -108,17 +109,15 @@ namespace osu.Game.Graphics.Cursor
                 {
                     cursorContainer = new Container
                     {
-                        Size = new Vector2(32),
+                        AutoSizeAxes = Axes.Both,
                         Children = new Drawable[]
                         {
                             new Sprite
                             {
-                                FillMode = FillMode.Fit,
                                 Texture = textures.Get(@"Cursor/menu-cursor"),
                             },
                             AdditiveLayer = new Sprite
                             {
-                                FillMode = FillMode.Fit,
                                 BlendingMode = BlendingMode.Additive,
                                 Colour = colour.Pink,
                                 Alpha = 0,
@@ -129,7 +128,7 @@ namespace osu.Game.Graphics.Cursor
                 };
 
                 cursorScale = config.GetBindable<double>(OsuSetting.MenuCursorSize);
-                cursorScale.ValueChanged += newScale => cursorContainer.Scale = new Vector2((float)newScale);
+                cursorScale.ValueChanged += newScale => cursorContainer.Scale = new Vector2((float)newScale * base_scale);
                 cursorScale.TriggerChange();
             }
         }