From 773d64cd5e90a7a4c0e139e140d4494b1c7b0ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sat, 3 Dec 2016 14:40:15 +0100 Subject: [PATCH] Update judgement after children have been updated. --- osu-framework | 2 +- osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs | 4 ++-- osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/osu-framework b/osu-framework index 3d9bf09831..f4693d8812 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 3d9bf098319583fc4fbbab5117702d000ad4fb9b +Subproject commit f4693d8812e305a41037a3b90495d5db2ac32a16 diff --git a/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs b/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs index 8e41fb6521..ed57f06e51 100644 --- a/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs +++ b/osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs @@ -87,9 +87,9 @@ namespace osu.Game.Modes.Objects.Drawables //todo: consider making abstract. } - protected override void Update() + protected override void UpdateAfterChildren() { - base.Update(); + base.UpdateAfterChildren(); UpdateJudgement(false); } diff --git a/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs b/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs index bc60123c02..22c214d82f 100644 --- a/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs +++ b/osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs @@ -106,9 +106,9 @@ namespace osu.Game.Overlays.Toolbar private Cached activeMode = new Cached(); - protected override void UpdateLayout() + protected override void UpdateAfterChildren() { - base.UpdateLayout(); + base.UpdateAfterChildren(); if (!activeMode.EnsureValid()) activeMode.Refresh(() => modeButtonLine.MoveToX(activeButton.DrawPosition.X, 200, EasingTypes.OutQuint));