sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-02 00:40:09 +09:00
Code Issues Packages Projects Releases Wiki Activity

TimelineContainer -> TimelineArea

Browse Source
This commit is contained in:
smoogipoo
2018-04-05 19:40:03 +09:00
parent a84536d343
commit d9e795fb9f
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
View File

@ -16,9 +16,9 @@ namespace osu.Game.Tests.Visual
[TestFixture] [TestFixture]
public class TestCaseEditorComposeTimeline : OsuTestCase public class TestCaseEditorComposeTimeline : OsuTestCase
{ {
public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(TimelineContainer), typeof(Timeline), typeof(BeatmapWaveformGraph), typeof(TimelineButton) }; public override IReadOnlyList<Type> RequiredTypes => new[] { typeof(TimelineArea), typeof(Timeline), typeof(BeatmapWaveformGraph), typeof(TimelineButton) };
private readonly TimelineContainer timelineContainer; private readonly TimelineArea timelineArea;
public TestCaseEditorComposeTimeline() public TestCaseEditorComposeTimeline()
{ {
@ -30,7 +30,7 @@ namespace osu.Game.Tests.Visual
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,
State = Visibility.Visible State = Visibility.Visible
}, },
timelineContainer = new TimelineContainer timelineArea = new TimelineArea
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
Origin = Anchor.Centre, Origin = Anchor.Centre,
@ -43,7 +43,7 @@ namespace osu.Game.Tests.Visual
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuGameBase osuGame) private void load(OsuGameBase osuGame)
{ {
timelineContainer.Beatmap.BindTo(osuGame.Beatmap); timelineArea.Beatmap.BindTo(osuGame.Beatmap);
} }
} }
} }

6
osu.Game/Screens/Edit/Screens/Compose/Compose.cs
View File

@ -31,7 +31,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose
{ {
dependencies.Cache(beatDivisor); dependencies.Cache(beatDivisor);
TimelineContainer timelineContainer; TimelineArea timelineArea;
Children = new Drawable[] Children = new Drawable[]
{ {
new GridContainer new GridContainer
@ -68,7 +68,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
Padding = new MarginPadding { Right = 5 }, Padding = new MarginPadding { Right = 5 },
Child = timelineContainer = new TimelineContainer { RelativeSizeAxes = Axes.Both } Child = timelineArea = new TimelineArea { RelativeSizeAxes = Axes.Both }
}, },
new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both } new BeatDivisorControl(beatDivisor) { RelativeSizeAxes = Axes.Both }
}, },
@ -97,7 +97,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose
}, },
}; };
timelineContainer.Beatmap.BindTo(Beatmap); timelineArea.Beatmap.BindTo(Beatmap);
var ruleset = Beatmap.Value.BeatmapInfo.Ruleset?.CreateInstance(); var ruleset = Beatmap.Value.BeatmapInfo.Ruleset?.CreateInstance();
if (ruleset == null) if (ruleset == null)

4
osu.Game/Screens/Edit/Screens/Compose/Timeline/TimelineContainer.cs → osu.Game/Screens/Edit/Screens/Compose/Timeline/TimelineArea.cs
View File

@ -12,13 +12,13 @@ using osu.Game.Graphics.UserInterface;
namespace osu.Game.Screens.Edit.Screens.Compose.Timeline namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
{ {
public class TimelineContainer : CompositeDrawable public class TimelineArea : CompositeDrawable
{ {
public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>(); public readonly Bindable<WorkingBeatmap> Beatmap = new Bindable<WorkingBeatmap>();
private readonly Timeline timeline; private readonly Timeline timeline;
public TimelineContainer() public TimelineArea()
{ {
Masking = true; Masking = true;
CornerRadius = 5; CornerRadius = 5;

2
osu.Game/Screens/Edit/Screens/Compose/Timeline/ZoomableScrollContainer.cs
View File

@ -76,7 +76,7 @@ namespace osu.Game.Screens.Edit.Screens.Compose.Timeline
private float startScrollOffset; private float startScrollOffset;
/// <summary> /// <summary>
/// Transforms <see cref="Timeline.zoom"/> to a new value. /// Transforms <see cref="TimeTimelinem"/> to a new value.
/// </summary> /// </summary>
/// <param name="focusPoint">The focus point in the waveform, in absolute coordinates local to the waveform.</param> /// <param name="focusPoint">The focus point in the waveform, in absolute coordinates local to the waveform.</param>
/// <param name="waveformSize">The size of the waveform.</param> /// <param name="waveformSize">The size of the waveform.</param>