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

Bring framework up-to-date

Browse Source
This commit is contained in:
Dean Herbert 2017-06-07 15:32:50 +09:00
parent a010e6b8db
commit 5f537780cf
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 4e82d99cbe1c9e60ca99beff91c7dbe84fee7897 Subproject commit 3ad1dd52ae511b816fb928f70ef811ec605c5c18

4
osu.Desktop.VisualTests/Tests/TestCaseManiaHitObjects.cs
View File

@ -40,7 +40,7 @@ namespace osu.Desktop.VisualTests.Tests
{ {
Name = "Timing section", Name = "Timing section",
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
RelativeCoordinateSpace = new Vector2(1, 10000), RelativeChildSize = new Vector2(1, 10000),
Children = new[] Children = new[]
{ {
new DrawableNote(new Note { StartTime = 5000 }) { AccentColour = Color4.Red }, new DrawableNote(new Note { StartTime = 5000 }) { AccentColour = Color4.Red },
@ -62,7 +62,7 @@ namespace osu.Desktop.VisualTests.Tests
{ {
Name = "Timing section", Name = "Timing section",
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
RelativeCoordinateSpace = new Vector2(1, 10000), RelativeChildSize = new Vector2(1, 10000),
Children = new[] Children = new[]
{ {
new DrawableHoldNote(new HoldNote new DrawableHoldNote(new HoldNote

2
osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
View File

@ -55,7 +55,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
tickContainer = new Container<DrawableHoldNoteTick> tickContainer = new Container<DrawableHoldNoteTick>
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
RelativeCoordinateSpace = new Vector2(1, (float)HitObject.Duration) RelativeChildSize = new Vector2(1, (float)HitObject.Duration)
}, },
head = new DrawableHeadNote(this, key) head = new DrawableHeadNote(this, key)
{ {

4
osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs
View File

@ -97,7 +97,7 @@ namespace osu.Game.Rulesets.Mania.Timing
// Adjust our height to account for the speed changes // Adjust our height to account for the speed changes
Height = (float)(1000 / timingChange.BeatLength / timingChange.SpeedMultiplier); Height = (float)(1000 / timingChange.BeatLength / timingChange.SpeedMultiplier);
RelativeCoordinateSpace = new Vector2(1, (float)parent.TimeSpan); RelativeChildSize = new Vector2(1, (float)parent.TimeSpan);
// Scroll the content // Scroll the content
content.Y = (float)(timingChange.Time - Time.Current); content.Y = (float)(timingChange.Time - Time.Current);
@ -146,7 +146,7 @@ namespace osu.Game.Rulesets.Mania.Timing
float height = Children.Select(child => child.Y + child.Height).Max(); float height = Children.Select(child => child.Y + child.Height).Max();
Height = height; Height = height;
RelativeCoordinateSpace = new Vector2(1, height); RelativeChildSize = new Vector2(1, height);
base.InvalidateFromChild(invalidation); base.InvalidateFromChild(invalidation);
} }

4
osu.Game/Overlays/Music/PlaylistItem.cs
View File

@ -22,7 +22,7 @@ namespace osu.Game.Overlays.Music
private Color4 artistColour; private Color4 artistColour;
private TextAwesome handle; private TextAwesome handle;
private Paragraph text; private TextFlowContainer text;
private IEnumerable<SpriteText> titleSprites; private IEnumerable<SpriteText> titleSprites;
private UnicodeBindableString titleBind; private UnicodeBindableString titleBind;
private UnicodeBindableString artistBind; private UnicodeBindableString artistBind;
@ -77,7 +77,7 @@ namespace osu.Game.Overlays.Music
Margin = new MarginPadding { Left = 5 }, Margin = new MarginPadding { Left = 5 },
Padding = new MarginPadding { Top = 2 }, Padding = new MarginPadding { Top = 2 },
}, },
text = new Paragraph text = new TextFlowContainer
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,