From 6db70f885037bff5129b2e34db92e852251a99f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sat, 4 Feb 2017 11:06:26 +0100 Subject: [PATCH 1/2] Use MaskingSmoothness to make masked diagonal edges smoother. --- osu-framework | 2 +- osu.Game/Graphics/UserInterface/TwoLayerButton.cs | 6 ++++-- osu.Game/Overlays/Pause/PauseButton.cs | 1 + osu.Game/Screens/Menu/Button.cs | 4 ++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/osu-framework b/osu-framework index 542d2eb587..a28f9011f2 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 542d2eb5877f0be8995943d18c7b98931322654a +Subproject commit a28f9011f25bd2633742d94ac691018c1f59e189 diff --git a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs index 22e11e21ad..75a24a6562 100644 --- a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs +++ b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs @@ -83,6 +83,7 @@ namespace osu.Game.Graphics.UserInterface RelativeSizeAxes = Axes.Both, Shear = new Vector2(shear, 0), Masking = true, + MaskingSmoothness = 2, EdgeEffect = new EdgeEffect { Type = EdgeEffectType.Shadow, Colour = Color4.Black.Opacity(0.2f), @@ -93,7 +94,7 @@ namespace osu.Game.Graphics.UserInterface IconLayer = new Box { RelativeSizeAxes = Axes.Both, - EdgeSmoothness = new Vector2(1.5f, 0), + EdgeSmoothness = new Vector2(2, 0), }, } }, @@ -116,6 +117,7 @@ namespace osu.Game.Graphics.UserInterface RelativeSizeAxes = Axes.Both, Shear = new Vector2(shear, 0), Masking = true, + MaskingSmoothness = 2, EdgeEffect = new EdgeEffect { Type = EdgeEffectType.Shadow, Colour = Color4.Black.Opacity(0.2f), @@ -128,7 +130,7 @@ namespace osu.Game.Graphics.UserInterface Origin = Anchor.TopLeft, Anchor = Anchor.TopLeft, RelativeSizeAxes = Axes.Both, - EdgeSmoothness = new Vector2(1.5f, 0), + EdgeSmoothness = new Vector2(2, 0), }, } }, diff --git a/osu.Game/Overlays/Pause/PauseButton.cs b/osu.Game/Overlays/Pause/PauseButton.cs index ed56cc7b85..80e0fb06a5 100644 --- a/osu.Game/Overlays/Pause/PauseButton.cs +++ b/osu.Game/Overlays/Pause/PauseButton.cs @@ -187,6 +187,7 @@ namespace osu.Game.Overlays.Pause Anchor = Anchor.Centre, Width = 0.8f, Masking = true, + MaskingSmoothness = 2, EdgeEffect = new EdgeEffect { Type = EdgeEffectType.Shadow, diff --git a/osu.Game/Screens/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs index 8a480faf18..576d4ac1fd 100644 --- a/osu.Game/Screens/Menu/Button.cs +++ b/osu.Game/Screens/Menu/Button.cs @@ -62,6 +62,7 @@ namespace osu.Game.Screens.Menu box = new Container { Masking = true, + MaskingSmoothness = 2, EdgeEffect = new EdgeEffect { Type = EdgeEffectType.Shadow, @@ -75,12 +76,11 @@ namespace osu.Game.Screens.Menu Scale = new Vector2(0, 1), Size = boxSize, Shear = new Vector2(ButtonSystem.wedge_width / boxSize.Y, 0), - Children = new Drawable[] { new Box { - EdgeSmoothness = new Vector2(2, 0), + EdgeSmoothness = new Vector2(1.5f, 0), RelativeSizeAxes = Axes.Both, }, } From 42ea3ea04f2941e671ac069b1659bc35245eb9a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sat, 4 Feb 2017 11:51:46 +0100 Subject: [PATCH 2/2] Update framework. --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index a28f9011f2..99955eecba 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit a28f9011f25bd2633742d94ac691018c1f59e189 +Subproject commit 99955eecba415328c3e2b4055afb10aeb8a4ceb9