Merge pull request #364 from peppy/general-fixes

Design improvements
ppy · Feb 16, 2017 · ecb840e · ecb840e
2 parents a3cdbe2 + aaed714
commit ecb840e
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 21 deletions.
diff --git a/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs b/osu.Game.Modes.Osu/Objects/Drawables/Pieces/ExplodePiece.cs
@@ -25,7 +25,7 @@ public ExplodePiece()
                 {
                     BlendingMode = BlendingMode.Additive,
                     RelativeSizeAxes = Axes.Both,
-                    Alpha = 0.1f,
+                    Alpha = 0.2f,
                 }
             };
         }

diff --git a/osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs b/osu.Game.Modes.Osu/UI/OsuScoreOverlay.cs
@@ -15,17 +15,19 @@ public class OsuScoreOverlay : ScoreOverlay
     {
         protected override ScoreCounter CreateScoreCounter() => new ScoreCounter()
         {
-            Anchor = Anchor.TopRight,
-            Origin = Anchor.TopRight,
-            TextSize = 60,
+            Anchor = Anchor.TopCentre,
+            Origin = Anchor.TopCentre,
+            TextSize = 40,
+            Position = new Vector2(0, 30),
             Margin = new MarginPadding { Right = 5 },
         };
 
         protected override PercentageCounter CreateAccuracyCounter() => new PercentageCounter()
         {
-            Anchor = Anchor.TopRight,
-            Origin = Anchor.TopRight,
-            Position = new Vector2(0, 55),
+            Anchor = Anchor.TopCentre,
+            Origin = Anchor.TopCentre,
+            Position = new Vector2(0, 65),
+            TextSize = 20,
             Margin = new MarginPadding { Right = 5 },
         };
 

diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs
@@ -107,7 +107,10 @@ protected RollingCounter()
         {
             Children = new Drawable[]
             {
-                DisplayedCountSpriteText = new OsuSpriteText(),
+                DisplayedCountSpriteText = new OsuSpriteText()
+                {
+                    Font = @"Venera"
+                },
             };
 
             TextSize = 40;

diff --git a/osu.Game/Modes/UI/HealthDisplay.cs b/osu.Game/Modes/UI/HealthDisplay.cs
@@ -1,23 +1,29 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
-// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
+// Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu-framework/master/LICENCE
 
-using OpenTK;
-using OpenTK.Graphics;
+using System;
+using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Transformations;
-using System;
+using osu.Game.Graphics;
+using OpenTK;
+using OpenTK.Graphics;
 
 namespace osu.Game.Modes.UI
 {
     public class HealthDisplay : Container
     {
         private Box background;
-        private Box fill;
+        private Container fill;
 
-        public BindableDouble Current = new BindableDouble() { MinValue = 0, MaxValue = 1 };
+        public BindableDouble Current = new BindableDouble()
+        {
+            MinValue = 0,
+            MaxValue = 1
+        };
 
         public HealthDisplay()
         {
@@ -26,19 +32,38 @@ public HealthDisplay()
                 background = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.Gray,
+                    Colour = Color4.Black,
                 },
-                fill = new Box
+                fill = new Container
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Colour = Color4.White,
                     Scale = new Vector2(0, 1),
-                }, 
+                    Masking = true,
+                    Children = new[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                        }
+                    }
+                },
             };
 
             Current.ValueChanged += current_ValueChanged;
         }
 
+        [BackgroundDependencyLoader]
+        private void laod(OsuColour colours)
+        {
+            fill.Colour = colours.BlueLighter;
+            fill.EdgeEffect = new EdgeEffect
+            {
+                Colour = colours.BlueDarker.Opacity(0.6f),
+                Radius = 8,
+                Type=  EdgeEffectType.Glow
+            };
+        }
+
         private void current_ValueChanged(object sender, EventArgs e)
         {
             fill.ScaleTo(new Vector2((float)Current, 1), 200, EasingTypes.OutQuint);

diff --git a/osu.Game/Modes/UI/ScoreOverlay.cs b/osu.Game/Modes/UI/ScoreOverlay.cs
@@ -27,9 +27,9 @@ public abstract class ScoreOverlay : Container
         protected abstract ScoreCounter CreateScoreCounter();
         protected virtual HealthDisplay CreateHealthDisplay() => new HealthDisplay
         {
-            Size = new Vector2(0.5f, 20),
+            Size = new Vector2(1, 5),
             RelativeSizeAxes = Axes.X,
-            Padding = new MarginPadding(5)
+            Margin = new MarginPadding { Top = 20 }
         };
 
         public virtual void OnHit(HitObject h)

diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -195,11 +195,12 @@ protected override bool OnMouseDown(InputState state, MouseDownEventArgs args)
 
         protected override bool OnMouseUp(InputState state, MouseUpEventArgs args)
         {
-
             logoBounceContainer.ScaleTo(1f, 500, EasingTypes.OutElastic);
             return true;
         }
 
+        protected override bool OnDragStart(InputState state) => true;
+
         protected override bool OnClick(InputState state)
         {
             if (!Interactive) return false;

diff --git a/osu.Game/Screens/Play/KeyCounter.cs b/osu.Game/Screens/Play/KeyCounter.cs
@@ -89,6 +89,8 @@ private void load(TextureStore textures)
                         new OsuSpriteText
                         {
                             Text = Name,
+                            Font = @"Venera",
+                            TextSize = 12,
                             Anchor = Anchor.Centre,
                             Origin = Anchor.Centre,
                             RelativePositionAxes = Axes.Both,

diff --git a/osu.Game/Screens/Select/Footer.cs b/osu.Game/Screens/Select/Footer.cs
@@ -25,6 +25,8 @@ public class Footer : Container
 
         private const float padding = 80;
 
+        public override bool Contains(Vector2 screenSpacePos) => true;
+
         public Action OnBack;
         public Action OnStart;