h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-05 21:22:56 +08:00
Code Issues Releases Wiki Activity

Merge pull request #526 from peppy/general-fixes

Browse Source 
Fix usages of CircularContainer in line with framework changes.
This commit is contained in:
Dan Balasescu 2017-03-22 21:48:16 +09:00 committed by GitHub
commit e5602c0938
7 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 405537bd351954878ddc1d2ba53e5d0563528446 Subproject commit 31cf1c4b58c866d047876b15a95a4cf0115d3105

2
osu.Game.Modes.Osu/Objects/Drawables/Pieces/NumberPiece.cs
View File

@ -29,6 +29,8 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
{ {
new CircularContainer new CircularContainer
{ {
Masking = true,
Origin = Anchor.Centre,
EdgeEffect = new EdgeEffect EdgeEffect = new EdgeEffect
{ {
Type = EdgeEffectType.Glow, Type = EdgeEffectType.Glow,

1
osu.Game.Modes.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
View File

@ -61,6 +61,7 @@ namespace osu.Game.Modes.Osu.Objects.Drawables.Pieces
{ {
Colour = Color4.White, Colour = Color4.White,
RelativePositionAxes = Axes.Both, RelativePositionAxes = Axes.Both,
Masking = true,
Origin = Anchor.Centre, Origin = Anchor.Centre,
Size = new Vector2(1 / ScreenSpaceDrawQuad.Width * 2000), Size = new Vector2(1 / ScreenSpaceDrawQuad.Width * 2000),
Children = new[] Children = new[]

2
osu.Game/Graphics/UserInterface/Nub.cs
View File

@ -30,6 +30,8 @@ namespace osu.Game.Graphics.UserInterface
BorderColour = Color4.White; BorderColour = Color4.White;
BorderThickness = border_width; BorderThickness = border_width;
Masking = true;
Children = new[] Children = new[]
{ {
fill = new Box fill = new Box

2
osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
View File

@ -28,6 +28,8 @@ namespace osu.Game.Graphics.UserInterface
circle = new CircularContainer circle = new CircularContainer
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Masking = true,
Alpha = 0, Alpha = 0,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Size = new Vector2(0.8f, 0), Size = new Vector2(0.8f, 0),

1
osu.Game/Overlays/Dialog/PopupDialog.cs
View File

@ -193,6 +193,7 @@ namespace osu.Game.Overlays.Dialog
{ {
Origin = Anchor.Centre, Origin = Anchor.Centre,
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Masking = true,
BorderColour = Color4.White, BorderColour = Color4.White,
BorderThickness = 5f, BorderThickness = 5f,
Children = new Drawable[] Children = new Drawable[]

2
osu.Game/Screens/Menu/OsuLogo.cs
View File

@ -91,8 +91,10 @@ namespace osu.Game.Screens.Menu
logoContainer = new CircularContainer logoContainer = new CircularContainer
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Scale = new Vector2(0.8f), Scale = new Vector2(0.8f),
Masking = true,
Children = new Drawable[] Children = new Drawable[]
{ {
colourAndTriangles = new Container colourAndTriangles = new Container