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

Merge remote-tracking branch 'origin/master' into timingchange-rework

Browse Source 
# Conflicts:
#	osu-framework
This commit is contained in:
smoogipooo
2017-06-12 13:09:02 +09:00
parent de35ea22b1 8bd9c112ba
commit 419682b740
50 changed files with 105 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game/Rulesets/Timing/DrawableTimingSection.cs
View File

@ -29,9 +29,9 @@ namespace osu.Game.Rulesets.Timing
/// </para>
///
/// <para>
/// This container will always be relatively-sized and positioned to its parent through the use of <see cref="Drawable.RelativeSizeAxes"/>
/// and <see cref="Drawable.RelativePositionAxes"/> such that the parent can utilise <see cref="Container{T}.RelativeChildSize"/> and
/// <see cref="Container{T}.RelativeChildOffset"/> to apply further time offsets to this collection of hit objects.
/// This container is and must always be relatively-sized and positioned to its such that the parent can utilise
/// <see cref="Container{T}.RelativeChildSize"/> and <see cref="Container{T}.RelativeChildOffset"/> to apply further time offsets
/// to this collection of hit objects.
/// </para>
/// </summary>
public abstract class DrawableTimingSection : Container<DrawableHitObject>
@ -57,6 +57,8 @@ namespace osu.Game.Rulesets.Timing
{
this.autoSizingAxes = autoSizingAxes;
RelativePositionAxes = Axes.Both;
// We need a default size since RelativeSizeAxes is overridden
Size = Vector2.One;
}
@ -69,12 +71,6 @@ namespace osu.Game.Rulesets.Timing
set { throw new InvalidOperationException($"{nameof(DrawableTimingSection)} must always be relatively-sized."); }
}
public override Axes RelativePositionAxes
{
get { return Axes.Both; }
set { throw new InvalidOperationException($"{nameof(DrawableTimingSection)} must always be relatively-positioned."); }
}
public override void InvalidateFromChild(Invalidation invalidation)
{
// We only want to re-compute our size when a child's size or position has changed