h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-30 09:32:55 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:ppy/osu into better-option-sliders

Browse Source
This commit is contained in:
Thomas Müller 2017-02-04 12:07:21 +01:00
commit 1913ec659a
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 3eb6af1e532442da444fc5365ef2bace47549f52 Subproject commit 99955eecba415328c3e2b4055afb10aeb8a4ceb9

6
osu.Game/Graphics/UserInterface/TwoLayerButton.cs
View File

@ -83,6 +83,7 @@ namespace osu.Game.Graphics.UserInterface
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Shear = new Vector2(shear, 0), Shear = new Vector2(shear, 0),
Masking = true, Masking = true,
MaskingSmoothness = 2,
EdgeEffect = new EdgeEffect { EdgeEffect = new EdgeEffect {
Type = EdgeEffectType.Shadow, Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.2f), Colour = Color4.Black.Opacity(0.2f),
@ -93,7 +94,7 @@ namespace osu.Game.Graphics.UserInterface
IconLayer = new Box IconLayer = new Box
{ {
RelativeSizeAxes = Axes.Both, 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, RelativeSizeAxes = Axes.Both,
Shear = new Vector2(shear, 0), Shear = new Vector2(shear, 0),
Masking = true, Masking = true,
MaskingSmoothness = 2,
EdgeEffect = new EdgeEffect { EdgeEffect = new EdgeEffect {
Type = EdgeEffectType.Shadow, Type = EdgeEffectType.Shadow,
Colour = Color4.Black.Opacity(0.2f), Colour = Color4.Black.Opacity(0.2f),
@ -128,7 +130,7 @@ namespace osu.Game.Graphics.UserInterface
Origin = Anchor.TopLeft, Origin = Anchor.TopLeft,
Anchor = Anchor.TopLeft, Anchor = Anchor.TopLeft,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
EdgeSmoothness = new Vector2(1.5f, 0), EdgeSmoothness = new Vector2(2, 0),
}, },
} }
}, },

1
osu.Game/Overlays/Pause/PauseButton.cs
View File

@ -187,6 +187,7 @@ namespace osu.Game.Overlays.Pause
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Width = 0.8f, Width = 0.8f,
Masking = true, Masking = true,
MaskingSmoothness = 2,
EdgeEffect = new EdgeEffect EdgeEffect = new EdgeEffect
{ {
Type = EdgeEffectType.Shadow, Type = EdgeEffectType.Shadow,

4
osu.Game/Screens/Menu/Button.cs
View File

@ -62,6 +62,7 @@ namespace osu.Game.Screens.Menu
box = new Container box = new Container
{ {
Masking = true, Masking = true,
MaskingSmoothness = 2,
EdgeEffect = new EdgeEffect EdgeEffect = new EdgeEffect
{ {
Type = EdgeEffectType.Shadow, Type = EdgeEffectType.Shadow,
@ -75,12 +76,11 @@ namespace osu.Game.Screens.Menu
Scale = new Vector2(0, 1), Scale = new Vector2(0, 1),
Size = boxSize, Size = boxSize,
Shear = new Vector2(ButtonSystem.wedge_width / boxSize.Y, 0), Shear = new Vector2(ButtonSystem.wedge_width / boxSize.Y, 0),
Children = new Drawable[] Children = new Drawable[]
{ {
new Box new Box
{ {
EdgeSmoothness = new Vector2(2, 0), EdgeSmoothness = new Vector2(1.5f, 0),
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
}, },
} }