Merge remote-tracking branch 'upstream/master' into raw-input-osd

osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs

@@ -79,7 +79,8 @@ namespace osu.Desktop.VisualTests.Tests
             {
                 score.Current.Value += 300 + (ulong)(300.0 * (comboCounter.Current > 0 ? comboCounter.Current - 1 : 0) / 25.0);
                 comboCounter.Increment();
-                numerator++; denominator++;
+                numerator++;
+                denominator++;
                 accuracyCounter.SetFraction(numerator, denominator);
             });
 

osu.Game.Rulesets.Mania/MathUtils/FastRandom.cs

@@ -87,6 +87,5 @@ namespace osu.Game.Rulesets.Mania.MathUtils
             bitIndex++;
             return ((bitBuffer >>= 1) & 1) == 1;
         }
-
     }
 }

osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs

@@ -134,7 +134,7 @@ namespace osu.Game.Rulesets.Mania.Timing
                 public override void InvalidateFromChild(Invalidation invalidation)
                 {
                     // We only want to re-compute our size when a child's size or position has changed
-                    if ((invalidation & Invalidation.Geometry) == 0)
+                    if ((invalidation & Invalidation.RequiredParentSizeToFit) == 0)
                     {
                         base.InvalidateFromChild(invalidation);
                         return;

osu.Game.Rulesets.Taiko/UI/TaikoPlayfield.cs

@@ -229,7 +229,6 @@ namespace osu.Game.Rulesets.Taiko.UI
 
                 if (judgedObject.HitObject.Kiai)
                     kiaiExplosionContainer.Add(new KiaiHitExplosion(judgedObject.Judgement, isRim));
-
             }
             else
                 hitExplosionContainer.Children.FirstOrDefault(e => e.Judgement == judgedObject.Judgement)?.VisualiseSecondHit();

osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs

@@ -166,4 +166,3 @@ namespace osu.Game.Tests.Beatmaps.IO
         }
     }
 }
-

osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs

@@ -86,4 +86,3 @@ namespace osu.Game.Tests.Beatmaps.IO
         }
     }
 }
-

osu.Game/Beatmaps/Drawables/DifficultyIcon.cs

@@ -10,7 +10,6 @@ using OpenTK.Graphics;
 
 namespace osu.Game.Beatmaps.Drawables
 {
-
     public class DifficultyIcon : DifficultyColouredContainer
     {
         private readonly BeatmapInfo beatmap;

osu.Game/Database/BeatmapDifficulty.cs

@@ -39,4 +39,3 @@ namespace osu.Game.Database
         }
     }
 }
-

osu.Game/Database/BeatmapSetInfo.cs

@@ -36,4 +36,3 @@ namespace osu.Game.Database
         public string StoryboardFile { get; set; }
     }
 }
-

osu.Game/Online/API/OAuthToken.cs

@@ -59,7 +59,6 @@ namespace osu.Game.Online.API
             {
 
             }
-
             return null;
         }
     }

osu.Game/Overlays/Chat/DrawableChannel.cs

@@ -86,6 +86,6 @@ namespace osu.Game.Overlays.Chat
             }
         }
 
-        private void scrollToEnd() => Scheduler.AddDelayed(() => scroll.ScrollToEnd(), 50);
+        private void scrollToEnd() => ScheduleAfterChildren(() => scroll.ScrollToEnd());
     }
 }

osu.Game/Overlays/Mods/ModButton.cs

@@ -20,7 +20,6 @@ using osu.Framework.Graphics.Cursor;
 
 namespace osu.Game.Overlays.Mods
 {
-
     /// <summary>
     /// Represents a clickable button which can cycle through one of more mods.
     /// </summary>
@@ -80,7 +79,7 @@ namespace osu.Game.Overlays.Mods
                     backgroundIcon.RotateTo(-rotate_angle * direction, mod_switch_duration, mod_switch_easing);
 
                     backgroundIcon.Icon = modAfter.Icon;
-                    using (iconsContainer.BeginDelayedSequence(mod_switch_duration, true))
+                    using (BeginDelayedSequence(mod_switch_duration, true))
                     {
                         foregroundIcon.RotateTo(-rotate_angle * direction);
                         foregroundIcon.RotateTo(0f, mod_switch_duration, mod_switch_easing);
@@ -88,7 +87,7 @@ namespace osu.Game.Overlays.Mods
                         backgroundIcon.RotateTo(rotate_angle * direction);
                         backgroundIcon.RotateTo(0f, mod_switch_duration, mod_switch_easing);
 
-                        iconsContainer.Schedule(() => displayMod(modAfter));
+                        Schedule(() => displayMod(modAfter));
                     }
                 }
 

osu.Game/Overlays/Music/PlaylistItem.cs

@@ -137,6 +137,7 @@ namespace osu.Game.Overlays.Music
 
         public bool MatchingFilter
         {
+            get { return matching; }
             set
             {
                 if (matching == value) return;
@@ -145,10 +146,6 @@ namespace osu.Game.Overlays.Music
 
                 FadeTo(matching ? 1 : 0, 200);
             }
-            get
-            {
-                return matching;
-            }
         }
     }
 }

osu.Game/Overlays/Settings/Sections/Gameplay/SongSelectSettings.cs

@@ -41,4 +41,3 @@ namespace osu.Game.Overlays.Settings.Sections.Gameplay
         }
     }
 }
-

osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs

@@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
             set
             {
                 bounding = value;
-                Invalidate(Invalidation.Geometry);
+                Invalidate(Invalidation.MiscGeometry);
             }
         }
 

osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs

@@ -33,4 +33,3 @@ namespace osu.Game.Overlays.Settings.Sections.General
         }
     }
 }
-

osu.Game/Overlays/Settings/Sections/GeneralSection.cs

@@ -22,4 +22,3 @@ namespace osu.Game.Overlays.Settings.Sections
         }
     }
 }
-

osu.Game/Overlays/Settings/Sections/GraphicsSection.cs

@@ -24,4 +24,3 @@ namespace osu.Game.Overlays.Settings.Sections
         }
     }
 }
-

osu.Game/Overlays/Settings/Sections/InputSection.cs

@@ -22,4 +22,3 @@ namespace osu.Game.Overlays.Settings.Sections
         }
     }
 }
-

osu.Game/Overlays/Settings/SettingsSubsection.cs

@@ -52,4 +52,3 @@ namespace osu.Game.Overlays.Settings
         }
     }
 }
-

osu.Game/Screens/Edit/Editor.cs

@@ -25,13 +25,13 @@ namespace osu.Game.Screens.Edit
         protected override void OnEntering(Screen last)
         {
             base.OnEntering(last);
-            Background.Schedule(() => Background.FadeColour(Color4.DarkGray, 500));
+            Background.FadeColour(Color4.DarkGray, 500);
             Beatmap?.Track?.Stop();
         }
 
         protected override bool OnExiting(Screen next)
         {
-            Background.Schedule(() => Background.FadeColour(Color4.White, 500));
+            Background.FadeColour(Color4.White, 500);
             Beatmap?.Track?.Start();
             return base.OnExiting(next);
         }

osu.Game/Screens/Menu/ButtonSystem.cs

@@ -192,10 +192,8 @@ namespace osu.Game.Screens.Menu
 
         public MenuState State
         {
-            get
+            get { return state; }
-            {
+
-                return state;
-            }
             set
             {
                 if (state == value) return;

osu.Game/Screens/Multiplayer/Match.cs

@@ -24,12 +24,12 @@ namespace osu.Game.Screens.Multiplayer
         {
             base.OnEntering(last);
 
-            Background.Schedule(() => Background.FadeColour(Color4.DarkGray, 500));
+            Background.FadeColour(Color4.DarkGray, 500);
         }
 
         protected override bool OnExiting(Screen next)
         {
-            Background.Schedule(() => Background.FadeColour(Color4.White, 500));
+            Background.FadeColour(Color4.White, 500);
             return base.OnExiting(next);
         }
     }

osu.Game/Screens/Play/HUD/ModDisplay.cs

@@ -54,7 +54,6 @@ namespace osu.Game.Screens.Play.HUD
                     {
                         AutoSizeAxes = Axes.Both,
                         Scale = new Vector2(0.6f),
-
                     });
                 }
 

osu.Game/Screens/Play/SquareGraph.cs

@@ -69,7 +69,7 @@ namespace osu.Game.Screens.Play
 
         public override bool Invalidate(Invalidation invalidation = Invalidation.All, Drawable source = null, bool shallPropagate = true)
         {
-            if ((invalidation & Invalidation.SizeInParentSpace) > 0)
+            if ((invalidation & Invalidation.DrawSize) > 0)
                 layout.Invalidate();
             return base.Invalidate(invalidation, source, shallPropagate);
         }

osu.Game/Screens/Ranking/Results.cs

@@ -71,7 +71,6 @@ namespace osu.Game.Screens.Ranking
 
             using (BeginDelayedSequence(transition_time * 0.25f, true))
             {
-
                 circleOuter.ScaleTo(1, transition_time, EasingTypes.OutQuint);
                 circleOuter.FadeTo(1, transition_time, EasingTypes.OutQuint);
 

osu.Game/Screens/Ranking/ResultsPage.cs

@@ -64,7 +64,8 @@ namespace osu.Game.Screens.Ranking
                     Origin = Anchor.Centre,
                     Children = new Drawable[]
                     {
-                        new Box{
+                        new Box
+                        {
                             RelativeSizeAxes = Axes.Both,
                             Alpha = 0,
                             AlwaysPresent = true
@@ -87,6 +88,5 @@ namespace osu.Game.Screens.Ranking
                 }
             });
         }
-
     }
 }

osu.Game/Screens/Tournament/Drawings.cs

@@ -335,7 +335,6 @@ namespace osu.Game.Screens.Tournament
                 {
                     Logger.Error(ex, "Failed to read last drawings results.");
                 }
-
             }
             else
             {