From 42be7857d1cbd30c7cccee384163004479174070 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Thu, 28 Feb 2019 13:58:19 +0900
Subject: [PATCH] Use expression body for property get/set where possible
---
.../Objects/Drawable/DrawableDroplet.cs | 2 +-
.../Objects/Drawable/Pieces/Pulp.cs | 2 +-
osu.Game.Rulesets.Catch/UI/CatcherArea.cs | 6 ++--
.../Objects/Drawables/DrawableHoldNote.cs | 2 +-
.../Objects/Drawables/DrawableHoldNoteTick.cs | 2 +-
.../Objects/Drawables/DrawableNote.cs | 2 +-
.../Objects/Drawables/Pieces/BodyPiece.cs | 4 +--
.../Objects/Drawables/Pieces/GlowPiece.cs | 2 +-
.../Objects/Drawables/Pieces/LaneGlowPiece.cs | 4 +--
.../Objects/Drawables/Pieces/NotePiece.cs | 2 +-
osu.Game.Rulesets.Mania/Objects/HoldNote.cs | 6 ++--
osu.Game.Rulesets.Mania/UI/Column.cs | 4 +--
.../Connections/FollowPointRenderer.cs | 6 ++--
.../Objects/Drawables/DrawableHitCircle.cs | 2 +-
.../Objects/Drawables/DrawableSlider.cs | 2 +-
.../Objects/Drawables/Pieces/NumberPiece.cs | 4 +--
.../Objects/Drawables/Pieces/SliderBall.cs | 4 +--
.../Drawables/Pieces/SpinnerBackground.cs | 5 +---
.../Objects/Drawables/Pieces/SpinnerDisc.cs | 8 ++---
.../Drawables/Pieces/SpinnerSpmCounter.cs | 2 +-
.../Objects/Drawables/Pieces/CirclePiece.cs | 4 +--
.../Objects/Drawables/Pieces/TaikoPiece.cs | 11 +++----
.../Objects/Drawables/Pieces/TickPiece.cs | 2 +-
.../Visual/TestCaseBeatSyncedContainer.cs | 2 +-
osu.Game/Beatmaps/BeatmapMetadata.cs | 4 +--
.../Drawables/UpdateableBeatmapSetCover.cs | 4 +--
osu.Game/Graphics/Backgrounds/Triangles.cs | 2 +-
.../Containers/ConstrainedIconContainer.cs | 14 +++------
.../Graphics/Containers/SectionsContainer.cs | 8 ++---
osu.Game/Graphics/SpriteIcon.cs | 7 ++---
osu.Game/Graphics/UserInterface/Bar.cs | 30 ++++---------------
osu.Game/Graphics/UserInterface/BarGraph.cs | 5 +---
.../UserInterface/BreadcrumbControl.cs | 2 +-
.../Graphics/UserInterface/DialogButton.cs | 15 ++--------
osu.Game/Graphics/UserInterface/IconButton.cs | 14 ++++-----
osu.Game/Graphics/UserInterface/LineGraph.cs | 2 +-
osu.Game/Graphics/UserInterface/Nub.cs | 13 ++++----
.../Graphics/UserInterface/OsuCheckbox.cs | 4 +--
.../Graphics/UserInterface/OsuDropdown.cs | 16 +++++-----
osu.Game/Graphics/UserInterface/OsuMenu.cs | 2 +-
.../Graphics/UserInterface/OsuSliderBar.cs | 2 +-
.../Graphics/UserInterface/OsuTabControl.cs | 9 ++----
.../UserInterface/OsuTabControlCheckbox.cs | 6 ++--
.../Graphics/UserInterface/ProgressBar.cs | 6 ++--
.../Graphics/UserInterface/RollingCounter.cs | 9 ++----
.../Graphics/UserInterface/StarCounter.cs | 5 +---
.../Graphics/UserInterface/TriangleButton.cs | 5 +---
.../Graphics/UserInterface/TwoLayerButton.cs | 17 +++--------
.../Input/Bindings/DatabasedKeyBinding.cs | 8 ++---
osu.Game/Online/API/APIAccess.cs | 2 +-
osu.Game/Online/API/OAuthToken.cs | 10 ++-----
osu.Game/Online/Leaderboards/Leaderboard.cs | 6 ++--
osu.Game/Overlays/BeatmapSet/AuthorInfo.cs | 2 +-
osu.Game/Overlays/BeatmapSet/BasicStats.cs | 8 ++---
osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs | 6 ++--
.../BeatmapSet/Buttons/PreviewButton.cs | 4 +--
osu.Game/Overlays/BeatmapSet/Details.cs | 4 +--
osu.Game/Overlays/BeatmapSet/Info.cs | 10 +++----
.../BeatmapSet/Scores/ClickableUsername.cs | 2 +-
.../BeatmapSet/Scores/DrawableTopScore.cs | 4 +--
.../BeatmapSet/Scores/ScoresContainer.cs | 2 +-
osu.Game/Overlays/BeatmapSet/SuccessRate.cs | 2 +-
.../Chat/Selection/ChannelListItem.cs | 5 +---
.../Overlays/Chat/Selection/ChannelSection.cs | 11 +++----
osu.Game/Overlays/Direct/DirectPanel.cs | 2 +-
osu.Game/Overlays/Direct/PlayButton.cs | 2 +-
osu.Game/Overlays/DirectOverlay.cs | 4 +--
osu.Game/Overlays/KeyBinding/KeyBindingRow.cs | 4 +--
.../Overlays/MedalSplash/DrawableMedal.cs | 2 +-
osu.Game/Overlays/Mods/ModButton.cs | 4 +--
osu.Game/Overlays/Music/PlaylistItem.cs | 4 +--
osu.Game/Overlays/Music/PlaylistList.cs | 8 ++---
.../Overlays/Notifications/Notification.cs | 2 +-
.../Notifications/NotificationSection.cs | 8 ++---
.../Notifications/ProgressNotification.cs | 19 +++++-------
.../Notifications/SimpleNotification.cs | 9 ++----
osu.Game/Overlays/Profile/ProfileHeader.cs | 2 +-
.../Profile/Sections/Kudosu/KudosuInfo.cs | 2 +-
.../Sections/General/LoginSettings.cs | 4 +--
.../Overlays/Settings/SettingsCheckbox.cs | 4 +--
osu.Game/Overlays/Settings/SettingsItem.cs | 12 +++-----
osu.Game/Overlays/Settings/SettingsSection.cs | 2 +-
.../Overlays/Settings/SettingsSubsection.cs | 5 +---
osu.Game/Overlays/Settings/Sidebar.cs | 2 +-
osu.Game/Overlays/Settings/SidebarButton.cs | 7 ++---
osu.Game/Overlays/SocialOverlay.cs | 2 +-
osu.Game/Overlays/Toolbar/ToolbarButton.cs | 23 +++++---------
.../Toolbar/ToolbarNotificationButton.cs | 2 +-
.../Toolbar/ToolbarOverlayToggleButton.cs | 2 +-
.../Overlays/Toolbar/ToolbarRulesetButton.cs | 2 +-
osu.Game/Rulesets/UI/ModIcon.cs | 6 ++--
.../Backgrounds/BackgroundScreenBeatmap.cs | 2 +-
osu.Game/Screens/Edit/BindableBeatDivisor.cs | 2 +-
.../RadioButtons/RadioButtonCollection.cs | 2 +-
.../Components/Timeline/TimelineButton.cs | 4 +--
osu.Game/Screens/Menu/Button.cs | 2 +-
osu.Game/Screens/Menu/ButtonSystem.cs | 2 +-
osu.Game/Screens/Menu/OsuLogo.cs | 6 ++--
.../Multi/Lounge/Components/DrawableRoom.cs | 4 +--
osu.Game/Screens/Play/Break/BlurredIcon.cs | 6 ++--
osu.Game/Screens/Play/Break/GlowIcon.cs | 10 +++----
osu.Game/Screens/Play/GameplayMenuOverlay.cs | 2 +-
osu.Game/Screens/Play/HUD/ComboCounter.cs | 4 +--
.../Screens/Play/HUD/StandardHealthDisplay.cs | 6 ++--
osu.Game/Screens/Play/KeyCounter.cs | 4 +--
osu.Game/Screens/Play/KeyCounterCollection.cs | 8 ++---
osu.Game/Screens/Play/PauseContainer.cs | 2 +-
.../PlayerSettings/PlayerSettingsGroup.cs | 2 +-
osu.Game/Screens/Play/SkipOverlay.cs | 2 +-
osu.Game/Screens/Play/SongProgress.cs | 7 ++---
osu.Game/Screens/Play/SongProgressBar.cs | 8 ++---
osu.Game/Screens/Play/SongProgressInfo.cs | 4 +--
osu.Game/Screens/Play/SquareGraph.cs | 10 +++----
osu.Game/Screens/Select/BeatmapDetailArea.cs | 5 +---
osu.Game/Screens/Select/BeatmapDetails.cs | 2 +-
.../Screens/Select/Details/AdvancedStats.cs | 12 ++++----
.../Screens/Select/Details/FailRetryGraph.cs | 2 +-
.../Screens/Select/Details/UserRatings.cs | 2 +-
osu.Game/Screens/Select/FilterControl.cs | 4 +--
osu.Game/Screens/Select/FilterCriteria.cs | 2 +-
osu.Game/Screens/Select/FooterButton.cs | 6 ++--
.../Select/Leaderboards/BeatmapLeaderboard.cs | 2 +-
.../Select/Options/BeatmapOptionsButton.cs | 16 +++++-----
.../Components/VisualiserContainer.cs | 2 +-
.../Tournament/ScrollingTeamContainer.cs | 4 +--
.../Drawables/DrawableStoryboard.cs | 2 +-
osu.Game/Users/Country.cs | 2 +-
osu.Game/Users/UpdateableAvatar.cs | 2 +-
osu.Game/Users/User.cs | 4 +--
osu.sln.DotSettings | 10 ++++++-
130 files changed, 297 insertions(+), 403 deletions(-)
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
index c80dacde93..8fed8eb4cd 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/DrawableDroplet.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable
public override Color4 AccentColour
{
- get { return base.AccentColour; }
+ get => base.AccentColour;
set
{
base.AccentColour = value;
diff --git a/osu.Game.Rulesets.Catch/Objects/Drawable/Pieces/Pulp.cs b/osu.Game.Rulesets.Catch/Objects/Drawable/Pieces/Pulp.cs
index d5adbee8aa..e150869132 100644
--- a/osu.Game.Rulesets.Catch/Objects/Drawable/Pieces/Pulp.cs
+++ b/osu.Game.Rulesets.Catch/Objects/Drawable/Pieces/Pulp.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Catch.Objects.Drawable.Pieces
private Color4 accentColour;
public Color4 AccentColour
{
- get { return accentColour; }
+ get => accentColour;
set
{
accentColour = value;
diff --git a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
index 438bfaef55..d0f50c6af2 100644
--- a/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
+++ b/osu.Game.Rulesets.Catch/UI/CatcherArea.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Rulesets.Catch.UI
public Container ExplodingFruitTarget
{
- set { MovableCatcher.ExplodingFruitTarget = value; }
+ set => MovableCatcher.ExplodingFruitTarget = value;
}
public CatcherArea(BeatmapDifficulty difficulty = null)
@@ -158,7 +158,7 @@ namespace osu.Game.Rulesets.Catch.UI
protected bool Dashing
{
- get { return dashing; }
+ get => dashing;
set
{
if (value == dashing) return;
@@ -176,7 +176,7 @@ namespace osu.Game.Rulesets.Catch.UI
/// </summary>
protected bool Trail
{
- get { return trail; }
+ get => trail;
set
{
if (value == trail) return;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
index 777c0ae566..4bfd940aa0 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
@@ -85,7 +85,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
public override Color4 AccentColour
{
- get { return base.AccentColour; }
+ get => base.AccentColour;
set
{
base.AccentColour = value;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
index eb7d153a90..43aac7907f 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNoteTick.cs
@@ -56,7 +56,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
public override Color4 AccentColour
{
- get { return base.AccentColour; }
+ get => base.AccentColour;
set
{
base.AccentColour = value;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
index c80681ea23..7ef90cdb9c 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/DrawableNote.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables
public override Color4 AccentColour
{
- get { return base.AccentColour; }
+ get => base.AccentColour;
set
{
base.AccentColour = value;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/BodyPiece.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/BodyPiece.cs
index 3decd46888..2858ae8c5b 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/BodyPiece.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/BodyPiece.cs
@@ -77,7 +77,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
public Color4 AccentColour
{
- get { return accentColour; }
+ get => accentColour;
set
{
if (accentColour == value)
@@ -90,7 +90,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
public bool Hitting
{
- get { return hitting; }
+ get => hitting;
set
{
hitting = value;
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/GlowPiece.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/GlowPiece.cs
index 4a54ac0aac..175a33d5b8 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/GlowPiece.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/GlowPiece.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
private Color4 accentColour;
public Color4 AccentColour
{
- get { return accentColour; }
+ get => accentColour;
set
{
if (accentColour == value)
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/LaneGlowPiece.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/LaneGlowPiece.cs
index 8927e0b068..9e0307c5c2 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/LaneGlowPiece.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/LaneGlowPiece.cs
@@ -78,8 +78,8 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
public Color4 AccentColour
{
- get { return Colour; }
- set { Colour = value; }
+ get => Colour;
+ set => Colour = value;
}
}
}
diff --git a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/NotePiece.cs b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/NotePiece.cs
index c5db6d7bd9..4d37b277b8 100644
--- a/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/NotePiece.cs
+++ b/osu.Game.Rulesets.Mania/Objects/Drawables/Pieces/NotePiece.cs
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Mania.Objects.Drawables.Pieces
private Color4 accentColour;
public Color4 AccentColour
{
- get { return accentColour; }
+ get => accentColour;
set
{
if (accentColour == value)
diff --git a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
index 8bb22fb586..6c2ac71ce3 100644
--- a/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
+++ b/osu.Game.Rulesets.Mania/Objects/HoldNote.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Rulesets.Mania.Objects
private double duration;
public double Duration
{
- get { return duration; }
+ get => duration;
set
{
duration = value;
@@ -29,7 +29,7 @@ namespace osu.Game.Rulesets.Mania.Objects
public override double StartTime
{
- get { return base.StartTime; }
+ get => base.StartTime;
set
{
base.StartTime = value;
@@ -40,7 +40,7 @@ namespace osu.Game.Rulesets.Mania.Objects
public override int Column
{
- get { return base.Column; }
+ get => base.Column;
set
{
base.Column = value;
diff --git a/osu.Game.Rulesets.Mania/UI/Column.cs b/osu.Game.Rulesets.Mania/UI/Column.cs
index 856ae8af33..2af99693eb 100644
--- a/osu.Game.Rulesets.Mania/UI/Column.cs
+++ b/osu.Game.Rulesets.Mania/UI/Column.cs
@@ -99,7 +99,7 @@ namespace osu.Game.Rulesets.Mania.UI
private bool isSpecial;
public bool IsSpecial
{
- get { return isSpecial; }
+ get => isSpecial;
set
{
if (isSpecial == value)
@@ -113,7 +113,7 @@ namespace osu.Game.Rulesets.Mania.UI
private Color4 accentColour;
public Color4 AccentColour
{
- get { return accentColour; }
+ get => accentColour;
set
{
if (accentColour == value)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
index ec8573cb94..1462f0459e 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Connections/FollowPointRenderer.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
/// </summary>
public int PointDistance
{
- get { return pointDistance; }
+ get => pointDistance;
set
{
if (pointDistance == value) return;
@@ -32,7 +32,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
/// </summary>
public int PreEmpt
{
- get { return preEmpt; }
+ get => preEmpt;
set
{
if (preEmpt == value) return;
@@ -44,7 +44,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Connections
private IEnumerable<OsuHitObject> hitObjects;
public override IEnumerable<OsuHitObject> HitObjects
{
- get { return hitObjects; }
+ get => hitObjects;
set
{
hitObjects = value;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
index d582113d25..decd0ce073 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableHitCircle.cs
@@ -102,7 +102,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
public override Color4 AccentColour
{
- get { return base.AccentColour; }
+ get => base.AccentColour;
set
{
base.AccentColour = value;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
index b55ec10d1d..6595e53a6a 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/DrawableSlider.cs
@@ -115,7 +115,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables
public override Color4 AccentColour
{
- get { return base.AccentColour; }
+ get => base.AccentColour;
set
{
base.AccentColour = value;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/NumberPiece.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/NumberPiece.cs
index 813cd51593..93ac8748dd 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/NumberPiece.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/NumberPiece.cs
@@ -18,8 +18,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
public string Text
{
- get { return number.Text; }
- set { number.Text = value; }
+ get => number.Text;
+ set => number.Text = value;
}
public NumberPiece()
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
index afa7f22140..cd69a050aa 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
/// </summary>
public Color4 AccentColour
{
- get { return accentColour; }
+ get => accentColour;
set
{
accentColour = value;
@@ -136,7 +136,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
public bool Tracking
{
- get { return tracking; }
+ get => tracking;
private set
{
if (value == tracking)
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs
index 0d970f4c2c..c982f53c2b 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerBackground.cs
@@ -15,10 +15,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
public Color4 AccentColour
{
- get
- {
- return Disc.Colour;
- }
+ get => Disc.Colour;
set
{
Disc.Colour = value;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
index 4206852b6c..18f9e85b33 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerDisc.cs
@@ -17,8 +17,8 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
public Color4 AccentColour
{
- get { return background.AccentColour; }
- set { background.AccentColour = value; }
+ get => background.AccentColour;
+ set => background.AccentColour = value;
}
private readonly SpinnerBackground background;
@@ -45,7 +45,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
private bool tracking;
public bool Tracking
{
- get { return tracking; }
+ get => tracking;
set
{
if (value == tracking) return;
@@ -58,7 +58,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
private bool complete;
public bool Complete
{
- get { return complete; }
+ get => complete;
set
{
if (value == complete) return;
diff --git a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerSpmCounter.cs b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerSpmCounter.cs
index 19f85bf4c3..b1b365920c 100644
--- a/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerSpmCounter.cs
+++ b/osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SpinnerSpmCounter.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Rulesets.Osu.Objects.Drawables.Pieces
public double SpinsPerMinute
{
- get { return spm; }
+ get => spm;
private set
{
if (value == spm) return;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
index 5369499dbc..53dbe5d08e 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/CirclePiece.cs
@@ -30,7 +30,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
/// </summary>
public override Color4 AccentColour
{
- get { return base.AccentColour; }
+ get => base.AccentColour;
set
{
base.AccentColour = value;
@@ -46,7 +46,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
/// </summary>
public override bool KiaiMode
{
- get { return base.KiaiMode; }
+ get => base.KiaiMode;
set
{
base.KiaiMode = value;
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs
index dd6a1a5021..abc42dec83 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TaikoPiece.cs
@@ -16,8 +16,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
/// </summary>
public virtual Color4 AccentColour
{
- get { return accentColour; }
- set { accentColour = value; }
+ get => accentColour;
+ set => accentColour = value;
}
private bool kiaiMode;
@@ -26,11 +26,8 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
/// </summary>
public virtual bool KiaiMode
{
- get { return kiaiMode; }
- set
- {
- kiaiMode = value;
- }
+ get => kiaiMode;
+ set => kiaiMode = value;
}
public TaikoPiece()
diff --git a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TickPiece.cs b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TickPiece.cs
index d625047d29..d53cb14909 100644
--- a/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TickPiece.cs
+++ b/osu.Game.Rulesets.Taiko/Objects/Drawables/Pieces/TickPiece.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Rulesets.Taiko.Objects.Drawables.Pieces
private bool filled;
public bool Filled
{
- get { return filled; }
+ get => filled;
set
{
filled = value;
diff --git a/osu.Game.Tests/Visual/TestCaseBeatSyncedContainer.cs b/osu.Game.Tests/Visual/TestCaseBeatSyncedContainer.cs
index 127ee9e482..92c1de6b9e 100644
--- a/osu.Game.Tests/Visual/TestCaseBeatSyncedContainer.cs
+++ b/osu.Game.Tests/Visual/TestCaseBeatSyncedContainer.cs
@@ -190,7 +190,7 @@ namespace osu.Game.Tests.Visual
public double Value
{
- set { valueText.Text = $"{value:G}"; }
+ set => valueText.Text = $"{value:G}";
}
public InfoString(string header)
diff --git a/osu.Game/Beatmaps/BeatmapMetadata.cs b/osu.Game/Beatmaps/BeatmapMetadata.cs
index bac8ad5ed7..91398dcd50 100644
--- a/osu.Game/Beatmaps/BeatmapMetadata.cs
+++ b/osu.Game/Beatmaps/BeatmapMetadata.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Beatmaps
[Column("Author")]
public string AuthorString
{
- get { return Author?.Username; }
- set { Author = new User { Username = value }; }
+ get => Author?.Username;
+ set => Author = new User { Username = value };
}
/// <summary>
diff --git a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
index 45df2b3406..dedd6764e5 100644
--- a/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
+++ b/osu.Game/Beatmaps/Drawables/UpdateableBeatmapSetCover.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Beatmaps.Drawables
private BeatmapSetInfo beatmapSet;
public BeatmapSetInfo BeatmapSet
{
- get { return beatmapSet; }
+ get => beatmapSet;
set
{
if (value == beatmapSet) return;
@@ -29,7 +29,7 @@ namespace osu.Game.Beatmaps.Drawables
private BeatmapSetCoverType coverType = BeatmapSetCoverType.Cover;
public BeatmapSetCoverType CoverType
{
- get { return coverType; }
+ get => coverType;
set
{
if (value == coverType) return;
diff --git a/osu.Game/Graphics/Backgrounds/Triangles.cs b/osu.Game/Graphics/Backgrounds/Triangles.cs
index f4abcd6496..3d881d73ca 100644
--- a/osu.Game/Graphics/Backgrounds/Triangles.cs
+++ b/osu.Game/Graphics/Backgrounds/Triangles.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Graphics.Backgrounds
public float TriangleScale
{
- get { return triangleScale; }
+ get => triangleScale;
set
{
float change = value / triangleScale;
diff --git a/osu.Game/Graphics/Containers/ConstrainedIconContainer.cs b/osu.Game/Graphics/Containers/ConstrainedIconContainer.cs
index e2e1385f3e..c1811f37d5 100644
--- a/osu.Game/Graphics/Containers/ConstrainedIconContainer.cs
+++ b/osu.Game/Graphics/Containers/ConstrainedIconContainer.cs
@@ -15,15 +15,9 @@ namespace osu.Game.Graphics.Containers
{
public Drawable Icon
{
- get
- {
- return InternalChild;
- }
+ get => InternalChild;
- set
- {
- InternalChild = value;
- }
+ set => InternalChild = value;
}
/// <summary>
@@ -33,8 +27,8 @@ namespace osu.Game.Graphics.Containers
/// </summary>
public new EdgeEffectParameters EdgeEffect
{
- get { return base.EdgeEffect; }
- set { base.EdgeEffect = value; }
+ get => base.EdgeEffect;
+ set => base.EdgeEffect = value;
}
protected override void Update()
diff --git a/osu.Game/Graphics/Containers/SectionsContainer.cs b/osu.Game/Graphics/Containers/SectionsContainer.cs
index b8ea4e299c..0878915e28 100644
--- a/osu.Game/Graphics/Containers/SectionsContainer.cs
+++ b/osu.Game/Graphics/Containers/SectionsContainer.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Graphics.Containers
public Drawable ExpandableHeader
{
- get { return expandableHeader; }
+ get => expandableHeader;
set
{
if (value == expandableHeader) return;
@@ -40,7 +40,7 @@ namespace osu.Game.Graphics.Containers
public Drawable FixedHeader
{
- get { return fixedHeader; }
+ get => fixedHeader;
set
{
if (value == fixedHeader) return;
@@ -56,7 +56,7 @@ namespace osu.Game.Graphics.Containers
public Drawable Footer
{
- get { return footer; }
+ get => footer;
set
{
if (value == footer) return;
@@ -75,7 +75,7 @@ namespace osu.Game.Graphics.Containers
public Drawable HeaderBackground
{
- get { return headerBackground; }
+ get => headerBackground;
set
{
if (value == headerBackground) return;
diff --git a/osu.Game/Graphics/SpriteIcon.cs b/osu.Game/Graphics/SpriteIcon.cs
index dcb29d50ea..907e6035df 100644
--- a/osu.Game/Graphics/SpriteIcon.cs
+++ b/osu.Game/Graphics/SpriteIcon.cs
@@ -106,7 +106,7 @@ namespace osu.Game.Graphics
private bool shadow;
public bool Shadow
{
- get { return shadow; }
+ get => shadow;
set
{
shadow = value;
@@ -119,10 +119,7 @@ namespace osu.Game.Graphics
public FontAwesome Icon
{
- get
- {
- return icon;
- }
+ get => icon;
set
{
diff --git a/osu.Game/Graphics/UserInterface/Bar.cs b/osu.Game/Graphics/UserInterface/Bar.cs
index 92b71a1cc3..37829f31e4 100644
--- a/osu.Game/Graphics/UserInterface/Bar.cs
+++ b/osu.Game/Graphics/UserInterface/Bar.cs
@@ -26,10 +26,7 @@ namespace osu.Game.Graphics.UserInterface
/// </summary>
public float Length
{
- get
- {
- return length;
- }
+ get => length;
set
{
length = MathHelper.Clamp(value, 0, 1);
@@ -39,35 +36,20 @@ namespace osu.Game.Graphics.UserInterface
public Color4 BackgroundColour
{
- get
- {
- return background.Colour;
- }
- set
- {
- background.Colour = value;
- }
+ get => background.Colour;
+ set => background.Colour = value;
}
public Color4 AccentColour
{
- get
- {
- return bar.Colour;
- }
- set
- {
- bar.Colour = value;
- }
+ get => bar.Colour;
+ set => bar.Colour = value;
}
private BarDirection direction = BarDirection.LeftToRight;
public BarDirection Direction
{
- get
- {
- return direction;
- }
+ get => direction;
set
{
direction = value;
diff --git a/osu.Game/Graphics/UserInterface/BarGraph.cs b/osu.Game/Graphics/UserInterface/BarGraph.cs
index 97335e3c42..10e786a2fd 100644
--- a/osu.Game/Graphics/UserInterface/BarGraph.cs
+++ b/osu.Game/Graphics/UserInterface/BarGraph.cs
@@ -19,10 +19,7 @@ namespace osu.Game.Graphics.UserInterface
private BarDirection direction = BarDirection.BottomToTop;
public new BarDirection Direction
{
- get
- {
- return direction;
- }
+ get => direction;
set
{
direction = value;
diff --git a/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs b/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
index e40168d213..5f2207384b 100644
--- a/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
+++ b/osu.Game/Graphics/UserInterface/BreadcrumbControl.cs
@@ -57,7 +57,7 @@ namespace osu.Game.Graphics.UserInterface
public Visibility State
{
- get { return state; }
+ get => state;
set
{
if (value == state) return;
diff --git a/osu.Game/Graphics/UserInterface/DialogButton.cs b/osu.Game/Graphics/UserInterface/DialogButton.cs
index 2796db51a5..fc0b28c328 100644
--- a/osu.Game/Graphics/UserInterface/DialogButton.cs
+++ b/osu.Game/Graphics/UserInterface/DialogButton.cs
@@ -156,10 +156,7 @@ namespace osu.Game.Graphics.UserInterface
private Color4 buttonColour;
public Color4 ButtonColour
{
- get
- {
- return buttonColour;
- }
+ get => buttonColour;
set
{
buttonColour = value;
@@ -171,10 +168,7 @@ namespace osu.Game.Graphics.UserInterface
private Color4 backgroundColour = OsuColour.Gray(34);
public Color4 BackgroundColour
{
- get
- {
- return backgroundColour;
- }
+ get => backgroundColour;
set
{
backgroundColour = value;
@@ -185,10 +179,7 @@ namespace osu.Game.Graphics.UserInterface
private string text;
public string Text
{
- get
- {
- return text;
- }
+ get => text;
set
{
text = value;
diff --git a/osu.Game/Graphics/UserInterface/IconButton.cs b/osu.Game/Graphics/UserInterface/IconButton.cs
index b9062b8d39..025aa30986 100644
--- a/osu.Game/Graphics/UserInterface/IconButton.cs
+++ b/osu.Game/Graphics/UserInterface/IconButton.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Graphics.UserInterface
/// </summary>
public Color4 IconColour
{
- get { return iconColour ?? Color4.White; }
+ get => iconColour ?? Color4.White;
set
{
iconColour = value;
@@ -34,8 +34,8 @@ namespace osu.Game.Graphics.UserInterface
/// </summary>
public Color4 IconHoverColour
{
- get { return iconHoverColour ?? IconColour; }
- set { iconHoverColour = value; }
+ get => iconHoverColour ?? IconColour;
+ set => iconHoverColour = value;
}
/// <summary>
@@ -43,8 +43,8 @@ namespace osu.Game.Graphics.UserInterface
/// </summary>
public FontAwesome Icon
{
- get { return icon.Icon; }
- set { icon.Icon = value; }
+ get => icon.Icon;
+ set => icon.Icon = value;
}
/// <summary>
@@ -52,8 +52,8 @@ namespace osu.Game.Graphics.UserInterface
/// </summary>
public Vector2 IconScale
{
- get { return icon.Scale; }
- set { icon.Scale = value; }
+ get => icon.Scale;
+ set => icon.Scale = value;
}
/// <summary>
diff --git a/osu.Game/Graphics/UserInterface/LineGraph.cs b/osu.Game/Graphics/UserInterface/LineGraph.cs
index 88d64c1bfb..4c4dbaf75a 100644
--- a/osu.Game/Graphics/UserInterface/LineGraph.cs
+++ b/osu.Game/Graphics/UserInterface/LineGraph.cs
@@ -44,7 +44,7 @@ namespace osu.Game.Graphics.UserInterface
/// </summary>
public IEnumerable<float> Values
{
- get { return values; }
+ get => values;
set
{
values = value.ToArray();
diff --git a/osu.Game/Graphics/UserInterface/Nub.cs b/osu.Game/Graphics/UserInterface/Nub.cs
index 470297a83c..fb3a947de1 100644
--- a/osu.Game/Graphics/UserInterface/Nub.cs
+++ b/osu.Game/Graphics/UserInterface/Nub.cs
@@ -74,7 +74,7 @@ namespace osu.Game.Graphics.UserInterface
private bool glowing;
public bool Glowing
{
- get { return glowing; }
+ get => glowing;
set
{
glowing = value;
@@ -94,10 +94,7 @@ namespace osu.Game.Graphics.UserInterface
public bool Expanded
{
- set
- {
- this.ResizeTo(new Vector2(value ? EXPANDED_SIZE : COLLAPSED_SIZE, 12), 500, Easing.OutQuint);
- }
+ set => this.ResizeTo(new Vector2(value ? EXPANDED_SIZE : COLLAPSED_SIZE, 12), 500, Easing.OutQuint);
}
private readonly Bindable<bool> current = new Bindable<bool>();
@@ -118,7 +115,7 @@ namespace osu.Game.Graphics.UserInterface
private Color4 accentColour;
public Color4 AccentColour
{
- get { return accentColour; }
+ get => accentColour;
set
{
accentColour = value;
@@ -130,7 +127,7 @@ namespace osu.Game.Graphics.UserInterface
private Color4 glowingAccentColour;
public Color4 GlowingAccentColour
{
- get { return glowingAccentColour; }
+ get => glowingAccentColour;
set
{
glowingAccentColour = value;
@@ -142,7 +139,7 @@ namespace osu.Game.Graphics.UserInterface
private Color4 glowColour;
public Color4 GlowColour
{
- get { return glowColour; }
+ get => glowColour;
set
{
glowColour = value;
diff --git a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
index 9f5fc503ad..de3d93d845 100644
--- a/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuCheckbox.cs
@@ -33,7 +33,7 @@ namespace osu.Game.Graphics.UserInterface
public string LabelText
{
- get { return labelSpriteText?.Text; }
+ get => labelSpriteText?.Text;
set
{
if (labelSpriteText != null)
@@ -43,7 +43,7 @@ namespace osu.Game.Graphics.UserInterface
public MarginPadding LabelPadding
{
- get { return labelSpriteText?.Padding ?? new MarginPadding(); }
+ get => labelSpriteText?.Padding ?? new MarginPadding();
set
{
if (labelSpriteText != null)
diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
index 0877776d0e..4af621a94a 100644
--- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs
+++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Graphics.UserInterface
private Color4 accentColour;
public Color4 AccentColour
{
- get { return accentColour; }
+ get => accentColour;
set
{
accentColour = value;
@@ -85,7 +85,7 @@ namespace osu.Game.Graphics.UserInterface
private Color4 accentColour;
public Color4 AccentColour
{
- get { return accentColour; }
+ get => accentColour;
set
{
accentColour = value;
@@ -105,7 +105,7 @@ namespace osu.Game.Graphics.UserInterface
private Color4? accentColour;
public Color4 AccentColour
{
- get { return accentColour ?? nonAccentSelectedColour; }
+ get => accentColour ?? nonAccentSelectedColour;
set
{
accentColour = value;
@@ -159,8 +159,8 @@ namespace osu.Game.Graphics.UserInterface
{
public string Text
{
- get { return Label.Text; }
- set { Label.Text = value; }
+ get => Label.Text;
+ set => Label.Text = value;
}
public readonly OsuSpriteText Label;
@@ -203,8 +203,8 @@ namespace osu.Game.Graphics.UserInterface
protected readonly SpriteText Text;
protected override string Label
{
- get { return Text.Text; }
- set { Text.Text = value; }
+ get => Text.Text;
+ set => Text.Text = value;
}
protected readonly SpriteIcon Icon;
@@ -212,7 +212,7 @@ namespace osu.Game.Graphics.UserInterface
private Color4 accentColour;
public virtual Color4 AccentColour
{
- get { return accentColour; }
+ get => accentColour;
set
{
accentColour = value;
diff --git a/osu.Game/Graphics/UserInterface/OsuMenu.cs b/osu.Game/Graphics/UserInterface/OsuMenu.cs
index 7fcefee23a..9b5755ea8b 100644
--- a/osu.Game/Graphics/UserInterface/OsuMenu.cs
+++ b/osu.Game/Graphics/UserInterface/OsuMenu.cs
@@ -125,7 +125,7 @@ namespace osu.Game.Graphics.UserInterface
{
public string Text
{
- get { return NormalText.Text; }
+ get => NormalText.Text;
set
{
NormalText.Text = value;
diff --git a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
index 3fd0ead760..59d6d99a41 100644
--- a/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
+++ b/osu.Game/Graphics/UserInterface/OsuSliderBar.cs
@@ -37,7 +37,7 @@ namespace osu.Game.Graphics.UserInterface
private Color4 accentColour;
public Color4 AccentColour
{
- get { return accentColour; }
+ get => accentColour;
set
{
accentColour = value;
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControl.cs b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
index 2db0325813..d29e81f423 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControl.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControl.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Graphics.UserInterface
private Color4 accentColour;
public Color4 AccentColour
{
- get { return accentColour; }
+ get => accentColour;
set
{
accentColour = value;
@@ -103,7 +103,7 @@ namespace osu.Game.Graphics.UserInterface
private Color4 accentColour;
public Color4 AccentColour
{
- get { return accentColour; }
+ get => accentColour;
set
{
accentColour = value;
@@ -224,10 +224,7 @@ namespace osu.Game.Graphics.UserInterface
{
public override Color4 AccentColour
{
- get
- {
- return base.AccentColour;
- }
+ get => base.AccentColour;
set
{
diff --git a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
index b56b9ec18f..71ad4c0255 100644
--- a/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
+++ b/osu.Game/Graphics/UserInterface/OsuTabControlCheckbox.cs
@@ -26,7 +26,7 @@ namespace osu.Game.Graphics.UserInterface
private Color4? accentColour;
public Color4 AccentColour
{
- get { return accentColour.GetValueOrDefault(); }
+ get => accentColour.GetValueOrDefault();
set
{
accentColour = value;
@@ -41,8 +41,8 @@ namespace osu.Game.Graphics.UserInterface
public string Text
{
- get { return text.Text; }
- set { text.Text = value; }
+ get => text.Text;
+ set => text.Text = value;
}
private const float transition_length = 500;
diff --git a/osu.Game/Graphics/UserInterface/ProgressBar.cs b/osu.Game/Graphics/UserInterface/ProgressBar.cs
index 04f85e62b7..d271cd121c 100644
--- a/osu.Game/Graphics/UserInterface/ProgressBar.cs
+++ b/osu.Game/Graphics/UserInterface/ProgressBar.cs
@@ -18,7 +18,7 @@ namespace osu.Game.Graphics.UserInterface
public Color4 FillColour
{
- set { fill.FadeColour(value, 150, Easing.OutQuint); }
+ set => fill.FadeColour(value, 150, Easing.OutQuint);
}
public Color4 BackgroundColour
@@ -32,12 +32,12 @@ namespace osu.Game.Graphics.UserInterface
public double EndTime
{
- set { CurrentNumber.MaxValue = value; }
+ set => CurrentNumber.MaxValue = value;
}
public double CurrentTime
{
- set { CurrentNumber.Value = value; }
+ set => CurrentNumber.Value = value;
}
public ProgressBar()
diff --git a/osu.Game/Graphics/UserInterface/RollingCounter.cs b/osu.Game/Graphics/UserInterface/RollingCounter.cs
index 52cd69a76e..249ff806b1 100644
--- a/osu.Game/Graphics/UserInterface/RollingCounter.cs
+++ b/osu.Game/Graphics/UserInterface/RollingCounter.cs
@@ -45,10 +45,7 @@ namespace osu.Game.Graphics.UserInterface
/// </summary>
public virtual T DisplayedCount
{
- get
- {
- return displayedCount;
- }
+ get => displayedCount;
set
{
@@ -70,8 +67,8 @@ namespace osu.Game.Graphics.UserInterface
public Color4 AccentColour
{
- get { return DisplayedCountSpriteText.Colour; }
- set { DisplayedCountSpriteText.Colour = value; }
+ get => DisplayedCountSpriteText.Colour;
+ set => DisplayedCountSpriteText.Colour = value;
}
/// <summary>
diff --git a/osu.Game/Graphics/UserInterface/StarCounter.cs b/osu.Game/Graphics/UserInterface/StarCounter.cs
index ad8ff8ec74..efdb466ae1 100644
--- a/osu.Game/Graphics/UserInterface/StarCounter.cs
+++ b/osu.Game/Graphics/UserInterface/StarCounter.cs
@@ -41,10 +41,7 @@ namespace osu.Game.Graphics.UserInterface
/// </summary>
public float CountStars
{
- get
- {
- return countStars;
- }
+ get => countStars;
set
{
diff --git a/osu.Game/Graphics/UserInterface/TriangleButton.cs b/osu.Game/Graphics/UserInterface/TriangleButton.cs
index 2375017878..685d230a4b 100644
--- a/osu.Game/Graphics/UserInterface/TriangleButton.cs
+++ b/osu.Game/Graphics/UserInterface/TriangleButton.cs
@@ -31,10 +31,7 @@ namespace osu.Game.Graphics.UserInterface
public bool MatchingFilter
{
- set
- {
- this.FadeTo(value ? 1 : 0);
- }
+ set => this.FadeTo(value ? 1 : 0);
}
}
}
diff --git a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
index eddacf8e2d..3dcc475407 100644
--- a/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
+++ b/osu.Game/Graphics/UserInterface/TwoLayerButton.cs
@@ -48,10 +48,7 @@ namespace osu.Game.Graphics.UserInterface
public override Anchor Origin
{
- get
- {
- return base.Origin;
- }
+ get => base.Origin;
set
{
@@ -155,18 +152,12 @@ namespace osu.Game.Graphics.UserInterface
public FontAwesome Icon
{
- set
- {
- bouncingIcon.Icon = value;
- }
+ set => bouncingIcon.Icon = value;
}
public string Text
{
- set
- {
- text.Text = value;
- }
+ set => text.Text = value;
}
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => IconLayer.ReceivePositionalInputAt(screenSpacePos) || TextLayer.ReceivePositionalInputAt(screenSpacePos);
@@ -217,7 +208,7 @@ namespace osu.Game.Graphics.UserInterface
private readonly SpriteIcon icon;
- public FontAwesome Icon { set { icon.Icon = value; } }
+ public FontAwesome Icon { set => icon.Icon = value; }
public BouncingIcon()
{
diff --git a/osu.Game/Input/Bindings/DatabasedKeyBinding.cs b/osu.Game/Input/Bindings/DatabasedKeyBinding.cs
index 5e15b07b46..8c0072c3da 100644
--- a/osu.Game/Input/Bindings/DatabasedKeyBinding.cs
+++ b/osu.Game/Input/Bindings/DatabasedKeyBinding.cs
@@ -19,15 +19,15 @@ namespace osu.Game.Input.Bindings
[Column("Keys")]
public string KeysString
{
- get { return KeyCombination.ToString(); }
- private set { KeyCombination = value; }
+ get => KeyCombination.ToString();
+ private set => KeyCombination = value;
}
[Column("Action")]
public int IntAction
{
- get { return (int)Action; }
- set { Action = value; }
+ get => (int)Action;
+ set => Action = value;
}
}
}
diff --git a/osu.Game/Online/API/APIAccess.cs b/osu.Game/Online/API/APIAccess.cs
index 9e84fd6009..df4b8464ab 100644
--- a/osu.Game/Online/API/APIAccess.cs
+++ b/osu.Game/Online/API/APIAccess.cs
@@ -260,7 +260,7 @@ namespace osu.Game.Online.API
public APIState State
{
- get { return state; }
+ get => state;
private set
{
APIState oldState = state;
diff --git a/osu.Game/Online/API/OAuthToken.cs b/osu.Game/Online/API/OAuthToken.cs
index 4c9c7b808f..1af8a2b652 100644
--- a/osu.Game/Online/API/OAuthToken.cs
+++ b/osu.Game/Online/API/OAuthToken.cs
@@ -19,15 +19,9 @@ namespace osu.Game.Online.API
[JsonProperty(@"expires_in")]
public long ExpiresIn
{
- get
- {
- return AccessTokenExpiry - DateTimeOffset.UtcNow.ToUnixTimeSeconds();
- }
+ get => AccessTokenExpiry - DateTimeOffset.UtcNow.ToUnixTimeSeconds();
- set
- {
- AccessTokenExpiry = DateTimeOffset.Now.AddSeconds(value).ToUnixTimeSeconds();
- }
+ set => AccessTokenExpiry = DateTimeOffset.Now.AddSeconds(value).ToUnixTimeSeconds();
}
public bool IsValid => !string.IsNullOrEmpty(AccessToken) && ExpiresIn > 30;
diff --git a/osu.Game/Online/Leaderboards/Leaderboard.cs b/osu.Game/Online/Leaderboards/Leaderboard.cs
index f3e7bb5c34..38df0efd6f 100644
--- a/osu.Game/Online/Leaderboards/Leaderboard.cs
+++ b/osu.Game/Online/Leaderboards/Leaderboard.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Online.Leaderboards
public IEnumerable<ScoreInfo> Scores
{
- get { return scores; }
+ get => scores;
set
{
scores = value;
@@ -98,7 +98,7 @@ namespace osu.Game.Online.Leaderboards
public TScope Scope
{
- get { return scope; }
+ get => scope;
set
{
if (value.Equals(scope))
@@ -117,7 +117,7 @@ namespace osu.Game.Online.Leaderboards
/// </summary>
protected PlaceholderState PlaceholderState
{
- get { return placeholderState; }
+ get => placeholderState;
set
{
if (value != PlaceholderState.Successful)
diff --git a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
index 8a75cfea50..e10fc6ba20 100644
--- a/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
+++ b/osu.Game/Overlays/BeatmapSet/AuthorInfo.cs
@@ -27,7 +27,7 @@ namespace osu.Game.Overlays.BeatmapSet
public BeatmapSetInfo BeatmapSet
{
- get { return beatmapSet; }
+ get => beatmapSet;
set
{
if (value == beatmapSet) return;
diff --git a/osu.Game/Overlays/BeatmapSet/BasicStats.cs b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
index ac2e5497af..ed8c50272c 100644
--- a/osu.Game/Overlays/BeatmapSet/BasicStats.cs
+++ b/osu.Game/Overlays/BeatmapSet/BasicStats.cs
@@ -21,7 +21,7 @@ namespace osu.Game.Overlays.BeatmapSet
public BeatmapSetInfo BeatmapSet
{
- get { return beatmapSet; }
+ get => beatmapSet;
set
{
if (value == beatmapSet) return;
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.BeatmapSet
public BeatmapInfo Beatmap
{
- get { return beatmap; }
+ get => beatmap;
set
{
if (value == beatmap) return;
@@ -95,8 +95,8 @@ namespace osu.Game.Overlays.BeatmapSet
public string Value
{
- get { return value.Text; }
- set { this.value.Text = value; }
+ get => value.Text;
+ set => this.value.Text = value;
}
public Statistic(FontAwesome icon, string name)
diff --git a/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs b/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
index 9f4ec0e814..1a16ea6a4a 100644
--- a/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
+++ b/osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.BeatmapSet
private BeatmapSetInfo beatmapSet;
public BeatmapSetInfo BeatmapSet
{
- get { return beatmapSet; }
+ get => beatmapSet;
set
{
if (value == beatmapSet) return;
@@ -196,7 +196,7 @@ namespace osu.Game.Overlays.BeatmapSet
private DifficultySelectorState state;
public DifficultySelectorState State
{
- get { return state; }
+ get => state;
set
{
if (value == state) return;
@@ -279,7 +279,7 @@ namespace osu.Game.Overlays.BeatmapSet
private int value;
public int Value
{
- get { return value; }
+ get => value;
set
{
this.value = value;
diff --git a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
index 269342525b..8c884e0950 100644
--- a/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
+++ b/osu.Game/Overlays/BeatmapSet/Buttons/PreviewButton.cs
@@ -30,8 +30,8 @@ namespace osu.Game.Overlays.BeatmapSet.Buttons
public BeatmapSetInfo BeatmapSet
{
- get { return playButton.BeatmapSet; }
- set { playButton.BeatmapSet = value; }
+ get => playButton.BeatmapSet;
+ set => playButton.BeatmapSet = value;
}
public PreviewButton()
diff --git a/osu.Game/Overlays/BeatmapSet/Details.cs b/osu.Game/Overlays/BeatmapSet/Details.cs
index 538d327d98..b62e211f18 100644
--- a/osu.Game/Overlays/BeatmapSet/Details.cs
+++ b/osu.Game/Overlays/BeatmapSet/Details.cs
@@ -25,7 +25,7 @@ namespace osu.Game.Overlays.BeatmapSet
public BeatmapSetInfo BeatmapSet
{
- get { return beatmapSet; }
+ get => beatmapSet;
set
{
if (value == beatmapSet) return;
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays.BeatmapSet
public BeatmapInfo Beatmap
{
- get { return beatmap; }
+ get => beatmap;
set
{
if (value == beatmap) return;
diff --git a/osu.Game/Overlays/BeatmapSet/Info.cs b/osu.Game/Overlays/BeatmapSet/Info.cs
index b6793d2609..8efb4d814e 100644
--- a/osu.Game/Overlays/BeatmapSet/Info.cs
+++ b/osu.Game/Overlays/BeatmapSet/Info.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.BeatmapSet
private BeatmapSetInfo beatmapSet;
public BeatmapSetInfo BeatmapSet
{
- get { return beatmapSet; }
+ get => beatmapSet;
set
{
if (value == beatmapSet) return;
@@ -46,8 +46,8 @@ namespace osu.Game.Overlays.BeatmapSet
public BeatmapInfo Beatmap
{
- get { return successRate.Beatmap; }
- set { successRate.Beatmap = value; }
+ get => successRate.Beatmap;
+ set => successRate.Beatmap = value;
}
public Info()
@@ -162,8 +162,8 @@ namespace osu.Game.Overlays.BeatmapSet
public Color4 TextColour
{
- get { return textFlow.Colour; }
- set { textFlow.Colour = value; }
+ get => textFlow.Colour;
+ set => textFlow.Colour = value;
}
public MetadataSection(string title)
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ClickableUsername.cs b/osu.Game/Overlays/BeatmapSet/Scores/ClickableUsername.cs
index 7933bfd9b6..168ce382a5 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ClickableUsername.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ClickableUsername.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private User user;
public User User
{
- get { return user; }
+ get => user;
set
{
if (user == value) return;
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs b/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
index c64bda9dfd..aeb314853f 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs
@@ -46,7 +46,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
private APIScoreInfo score;
public APIScoreInfo Score
{
- get { return score; }
+ get => score;
set
{
if (score == value) return;
@@ -209,7 +209,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
return;
valueText.Text = value;
}
- get { return valueText.Text; }
+ get => valueText.Text;
}
public InfoColumn(string header)
diff --git a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
index ab34d2ba1d..6c65d491af 100644
--- a/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
+++ b/osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Overlays.BeatmapSet.Scores
public IEnumerable<APIScoreInfo> Scores
{
- get { return scores; }
+ get => scores;
set
{
getScoresRequest?.Cancel();
diff --git a/osu.Game/Overlays/BeatmapSet/SuccessRate.cs b/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
index 0a844028fe..1ca83849d5 100644
--- a/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
+++ b/osu.Game/Overlays/BeatmapSet/SuccessRate.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Overlays.BeatmapSet
private BeatmapInfo beatmap;
public BeatmapInfo Beatmap
{
- get { return beatmap; }
+ get => beatmap;
set
{
if (value == beatmap) return;
diff --git a/osu.Game/Overlays/Chat/Selection/ChannelListItem.cs b/osu.Game/Overlays/Chat/Selection/ChannelListItem.cs
index 1dd888a3e9..71d915d577 100644
--- a/osu.Game/Overlays/Chat/Selection/ChannelListItem.cs
+++ b/osu.Game/Overlays/Chat/Selection/ChannelListItem.cs
@@ -38,10 +38,7 @@ namespace osu.Game.Overlays.Chat.Selection
public IEnumerable<string> FilterTerms => new[] { channel.Name };
public bool MatchingFilter
{
- set
- {
- this.FadeTo(value ? 1f : 0f, 100);
- }
+ set => this.FadeTo(value ? 1f : 0f, 100);
}
public Action<Channel> OnRequestJoin;
diff --git a/osu.Game/Overlays/Chat/Selection/ChannelSection.cs b/osu.Game/Overlays/Chat/Selection/ChannelSection.cs
index 160bf05a2b..dbb40cec95 100644
--- a/osu.Game/Overlays/Chat/Selection/ChannelSection.cs
+++ b/osu.Game/Overlays/Chat/Selection/ChannelSection.cs
@@ -23,21 +23,18 @@ namespace osu.Game.Overlays.Chat.Selection
public IEnumerable<string> FilterTerms => Array.Empty<string>();
public bool MatchingFilter
{
- set
- {
- this.FadeTo(value ? 1f : 0f, 100);
- }
+ set => this.FadeTo(value ? 1f : 0f, 100);
}
public string Header
{
- get { return header.Text; }
- set { header.Text = value.ToUpperInvariant(); }
+ get => header.Text;
+ set => header.Text = value.ToUpperInvariant();
}
public IEnumerable<Channel> Channels
{
- set { ChannelFlow.ChildrenEnumerable = value.Select(c => new ChannelListItem(c)); }
+ set => ChannelFlow.ChildrenEnumerable = value.Select(c => new ChannelListItem(c));
}
public ChannelSection()
diff --git a/osu.Game/Overlays/Direct/DirectPanel.cs b/osu.Game/Overlays/Direct/DirectPanel.cs
index d7eae000b8..3867886f6d 100644
--- a/osu.Game/Overlays/Direct/DirectPanel.cs
+++ b/osu.Game/Overlays/Direct/DirectPanel.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Overlays.Direct
public int Value
{
- get { return value; }
+ get => value;
set
{
this.value = value;
diff --git a/osu.Game/Overlays/Direct/PlayButton.cs b/osu.Game/Overlays/Direct/PlayButton.cs
index e001c2d3ea..2f064a285c 100644
--- a/osu.Game/Overlays/Direct/PlayButton.cs
+++ b/osu.Game/Overlays/Direct/PlayButton.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Overlays.Direct
public BeatmapSetInfo BeatmapSet
{
- get { return beatmapSet; }
+ get => beatmapSet;
set
{
if (value == beatmapSet) return;
diff --git a/osu.Game/Overlays/DirectOverlay.cs b/osu.Game/Overlays/DirectOverlay.cs
index d3881b6ef8..cef022b3a4 100644
--- a/osu.Game/Overlays/DirectOverlay.cs
+++ b/osu.Game/Overlays/DirectOverlay.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Overlays
public IEnumerable<BeatmapSetInfo> BeatmapSets
{
- get { return beatmapSets; }
+ get => beatmapSets;
set
{
if (beatmapSets?.Equals(value) ?? false) return;
@@ -72,7 +72,7 @@ namespace osu.Game.Overlays
public ResultCounts ResultAmounts
{
- get { return resultAmounts; }
+ get => resultAmounts;
set
{
if (value == ResultAmounts) return;
diff --git a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
index 8a8ad0d964..31fa1d5a7b 100644
--- a/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
+++ b/osu.Game/Overlays/KeyBinding/KeyBindingRow.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Overlays.KeyBinding
public bool MatchingFilter
{
- get { return matchingFilter; }
+ get => matchingFilter;
set
{
matchingFilter = value;
@@ -309,7 +309,7 @@ namespace osu.Game.Overlays.KeyBinding
public bool IsBinding
{
- get { return isBinding; }
+ get => isBinding;
set
{
if (value == isBinding) return;
diff --git a/osu.Game/Overlays/MedalSplash/DrawableMedal.cs b/osu.Game/Overlays/MedalSplash/DrawableMedal.cs
index 2dedef8fb2..d0d843d951 100644
--- a/osu.Game/Overlays/MedalSplash/DrawableMedal.cs
+++ b/osu.Game/Overlays/MedalSplash/DrawableMedal.cs
@@ -132,7 +132,7 @@ namespace osu.Game.Overlays.MedalSplash
public DisplayState State
{
- get { return state; }
+ get => state;
set
{
if (state == value) return;
diff --git a/osu.Game/Overlays/Mods/ModButton.cs b/osu.Game/Overlays/Mods/ModButton.cs
index f9cc19419c..abadfcf39d 100644
--- a/osu.Game/Overlays/Mods/ModButton.cs
+++ b/osu.Game/Overlays/Mods/ModButton.cs
@@ -107,7 +107,7 @@ namespace osu.Game.Overlays.Mods
public Color4 SelectedColour
{
- get { return selectedColour; }
+ get => selectedColour;
set
{
if (value == selectedColour) return;
@@ -121,7 +121,7 @@ namespace osu.Game.Overlays.Mods
public Mod Mod
{
- get { return mod; }
+ get => mod;
set
{
mod = value;
diff --git a/osu.Game/Overlays/Music/PlaylistItem.cs b/osu.Game/Overlays/Music/PlaylistItem.cs
index 65f02e1839..5f188e3412 100644
--- a/osu.Game/Overlays/Music/PlaylistItem.cs
+++ b/osu.Game/Overlays/Music/PlaylistItem.cs
@@ -52,7 +52,7 @@ namespace osu.Game.Overlays.Music
private bool selected;
public bool Selected
{
- get { return selected; }
+ get => selected;
set
{
if (value == selected) return;
@@ -142,7 +142,7 @@ namespace osu.Game.Overlays.Music
public bool MatchingFilter
{
- get { return matching; }
+ get => matching;
set
{
if (matching == value) return;
diff --git a/osu.Game/Overlays/Music/PlaylistList.cs b/osu.Game/Overlays/Music/PlaylistList.cs
index b02ad242aa..1496523db0 100644
--- a/osu.Game/Overlays/Music/PlaylistList.cs
+++ b/osu.Game/Overlays/Music/PlaylistList.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Overlays.Music
public new MarginPadding Padding
{
- get { return base.Padding; }
- set { base.Padding = value; }
+ get => base.Padding;
+ set => base.Padding = value;
}
public BeatmapSetInfo FirstVisibleSet => items.FirstVisibleSet;
@@ -109,8 +109,8 @@ namespace osu.Game.Overlays.Music
public string SearchTerm
{
- get { return search.SearchTerm; }
- set { search.SearchTerm = value; }
+ get => search.SearchTerm;
+ set => search.SearchTerm = value;
}
public BeatmapSetInfo FirstVisibleSet => items.FirstOrDefault(i => i.MatchingFilter)?.BeatmapSetInfo;
diff --git a/osu.Game/Overlays/Notifications/Notification.cs b/osu.Game/Overlays/Notifications/Notification.cs
index b77b6f837d..fc5812e9e2 100644
--- a/osu.Game/Overlays/Notifications/Notification.cs
+++ b/osu.Game/Overlays/Notifications/Notification.cs
@@ -205,7 +205,7 @@ namespace osu.Game.Overlays.Notifications
public bool Pulsate
{
- get { return pulsate; }
+ get => pulsate;
set
{
if (pulsate == value) return;
diff --git a/osu.Game/Overlays/Notifications/NotificationSection.cs b/osu.Game/Overlays/Notifications/NotificationSection.cs
index 6b0e17a482..4608d78324 100644
--- a/osu.Game/Overlays/Notifications/NotificationSection.cs
+++ b/osu.Game/Overlays/Notifications/NotificationSection.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Notifications
public string ClearText
{
- get { return clearText; }
+ get => clearText;
set
{
clearText = value;
@@ -51,7 +51,7 @@ namespace osu.Game.Overlays.Notifications
public string Title
{
- get { return title; }
+ get => title;
set
{
title = value;
@@ -153,8 +153,8 @@ namespace osu.Game.Overlays.Notifications
public string Text
{
- get { return text.Text; }
- set { text.Text = value.ToUpperInvariant(); }
+ get => text.Text;
+ set => text.Text = value.ToUpperInvariant();
}
}
diff --git a/osu.Game/Overlays/Notifications/ProgressNotification.cs b/osu.Game/Overlays/Notifications/ProgressNotification.cs
index efb66a7153..e0c0a624ca 100644
--- a/osu.Game/Overlays/Notifications/ProgressNotification.cs
+++ b/osu.Game/Overlays/Notifications/ProgressNotification.cs
@@ -17,18 +17,15 @@ namespace osu.Game.Overlays.Notifications
{
public string Text
{
- set
- {
- Schedule(() => textDrawable.Text = value);
- }
+ set => Schedule(() => textDrawable.Text = value);
}
public string CompletionText { get; set; } = "Task has completed!";
public float Progress
{
- get { return progressBar.Progress; }
- set { Schedule(() => progressBar.Progress = value); }
+ get => progressBar.Progress;
+ set => Schedule(() => progressBar.Progress = value);
}
protected override void LoadComplete()
@@ -41,9 +38,8 @@ namespace osu.Game.Overlays.Notifications
public virtual ProgressNotificationState State
{
- get { return state; }
- set
- {
+ get => state;
+ set =>
Schedule(() =>
{
bool stateChanged = state != value;
@@ -82,7 +78,6 @@ namespace osu.Game.Overlays.Notifications
}
}
});
- }
}
private ProgressNotificationState state;
@@ -180,7 +175,7 @@ namespace osu.Game.Overlays.Notifications
private float progress;
public float Progress
{
- get { return progress; }
+ get => progress;
set
{
if (progress == value) return;
@@ -194,7 +189,7 @@ namespace osu.Game.Overlays.Notifications
public bool Active
{
- get { return active; }
+ get => active;
set
{
active = value;
diff --git a/osu.Game/Overlays/Notifications/SimpleNotification.cs b/osu.Game/Overlays/Notifications/SimpleNotification.cs
index 91dab14a62..b7e01b57c7 100644
--- a/osu.Game/Overlays/Notifications/SimpleNotification.cs
+++ b/osu.Game/Overlays/Notifications/SimpleNotification.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Notifications
private string text = string.Empty;
public string Text
{
- get { return text; }
+ get => text;
set
{
text = value;
@@ -28,7 +28,7 @@ namespace osu.Game.Overlays.Notifications
private FontAwesome icon = FontAwesome.fa_info_circle;
public FontAwesome Icon
{
- get { return icon; }
+ get => icon;
set
{
icon = value;
@@ -76,10 +76,7 @@ namespace osu.Game.Overlays.Notifications
public override bool Read
{
- get
- {
- return base.Read;
- }
+ get => base.Read;
set
{
diff --git a/osu.Game/Overlays/Profile/ProfileHeader.cs b/osu.Game/Overlays/Profile/ProfileHeader.cs
index 56e34cf296..2f807edd06 100644
--- a/osu.Game/Overlays/Profile/ProfileHeader.cs
+++ b/osu.Game/Overlays/Profile/ProfileHeader.cs
@@ -318,7 +318,7 @@ namespace osu.Game.Overlays.Profile
public User User
{
- get { return user; }
+ get => user;
set
{
user = value;
diff --git a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
index 9d60851f6e..3c69082e9d 100644
--- a/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
+++ b/osu.Game/Overlays/Profile/Sections/Kudosu/KudosuInfo.cs
@@ -78,7 +78,7 @@ namespace osu.Game.Overlays.Profile.Sections.Kudosu
public new int Count
{
- set { valueText.Text = value.ToString(); }
+ set => valueText.Text = value.ToString();
}
public CountSection(string header, string description)
diff --git a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
index 4e1130690f..d5b9b241aa 100644
--- a/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
+++ b/osu.Game/Overlays/Settings/Sections/General/LoginSettings.cs
@@ -41,7 +41,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
public bool Bounding
{
- get { return bounding; }
+ get => bounding;
set
{
bounding = value;
@@ -338,7 +338,7 @@ namespace osu.Game.Overlays.Settings.Sections.General
public Color4 StatusColour
{
- set { statusIcon.FadeColour(value, 500, Easing.OutQuint); }
+ set => statusIcon.FadeColour(value, 500, Easing.OutQuint);
}
public UserDropdownHeader()
diff --git a/osu.Game/Overlays/Settings/SettingsCheckbox.cs b/osu.Game/Overlays/Settings/SettingsCheckbox.cs
index 71c197b784..46c23c3bbf 100644
--- a/osu.Game/Overlays/Settings/SettingsCheckbox.cs
+++ b/osu.Game/Overlays/Settings/SettingsCheckbox.cs
@@ -14,8 +14,8 @@ namespace osu.Game.Overlays.Settings
public override string LabelText
{
- get { return checkbox.LabelText; }
- set { checkbox.LabelText = value; }
+ get => checkbox.LabelText;
+ set => checkbox.LabelText = value;
}
}
}
diff --git a/osu.Game/Overlays/Settings/SettingsItem.cs b/osu.Game/Overlays/Settings/SettingsItem.cs
index de7e8bbd71..f6517bafd6 100644
--- a/osu.Game/Overlays/Settings/SettingsItem.cs
+++ b/osu.Game/Overlays/Settings/SettingsItem.cs
@@ -39,7 +39,7 @@ namespace osu.Game.Overlays.Settings
public virtual string LabelText
{
- get { return text?.Text ?? string.Empty; }
+ get => text?.Text ?? string.Empty;
set
{
if (text == null)
@@ -58,7 +58,7 @@ namespace osu.Game.Overlays.Settings
public virtual Bindable<T> Bindable
{
- get { return bindable; }
+ get => bindable;
set
{
@@ -76,11 +76,7 @@ namespace osu.Game.Overlays.Settings
public bool MatchingFilter
{
- set
- {
- // probably needs a better transition.
- this.FadeTo(value ? 1 : 0);
- }
+ set => this.FadeTo(value ? 1 : 0);
}
protected SettingsItem()
@@ -115,7 +111,7 @@ namespace osu.Game.Overlays.Settings
public Bindable<T> Bindable
{
- get { return bindable; }
+ get => bindable;
set
{
bindable = value;
diff --git a/osu.Game/Overlays/Settings/SettingsSection.cs b/osu.Game/Overlays/Settings/SettingsSection.cs
index cf8544af17..38a8b58a68 100644
--- a/osu.Game/Overlays/Settings/SettingsSection.cs
+++ b/osu.Game/Overlays/Settings/SettingsSection.cs
@@ -31,7 +31,7 @@ namespace osu.Game.Overlays.Settings
public bool MatchingFilter
{
- set { this.FadeTo(value ? 1 : 0); }
+ set => this.FadeTo(value ? 1 : 0);
}
protected SettingsSection()
diff --git a/osu.Game/Overlays/Settings/SettingsSubsection.cs b/osu.Game/Overlays/Settings/SettingsSubsection.cs
index 9a3eeac5d0..3853308b28 100644
--- a/osu.Game/Overlays/Settings/SettingsSubsection.cs
+++ b/osu.Game/Overlays/Settings/SettingsSubsection.cs
@@ -24,10 +24,7 @@ namespace osu.Game.Overlays.Settings
public IEnumerable<string> FilterTerms => new[] { Header };
public bool MatchingFilter
{
- set
- {
- this.FadeTo(value ? 1 : 0);
- }
+ set => this.FadeTo(value ? 1 : 0);
}
protected SettingsSubsection()
diff --git a/osu.Game/Overlays/Settings/Sidebar.cs b/osu.Game/Overlays/Settings/Sidebar.cs
index 960ceaa78f..969686e36d 100644
--- a/osu.Game/Overlays/Settings/Sidebar.cs
+++ b/osu.Game/Overlays/Settings/Sidebar.cs
@@ -88,7 +88,7 @@ namespace osu.Game.Overlays.Settings
public ExpandedState State
{
- get { return state; }
+ get => state;
set
{
expandEvent?.Cancel();
diff --git a/osu.Game/Overlays/Settings/SidebarButton.cs b/osu.Game/Overlays/Settings/SidebarButton.cs
index c53596cabe..a900afd41a 100644
--- a/osu.Game/Overlays/Settings/SidebarButton.cs
+++ b/osu.Game/Overlays/Settings/SidebarButton.cs
@@ -28,10 +28,7 @@ namespace osu.Game.Overlays.Settings
private SettingsSection section;
public SettingsSection Section
{
- get
- {
- return section;
- }
+ get => section;
set
{
section = value;
@@ -43,7 +40,7 @@ namespace osu.Game.Overlays.Settings
private bool selected;
public bool Selected
{
- get { return selected; }
+ get => selected;
set
{
selected = value;
diff --git a/osu.Game/Overlays/SocialOverlay.cs b/osu.Game/Overlays/SocialOverlay.cs
index 9ee255819a..b89fd6c2e6 100644
--- a/osu.Game/Overlays/SocialOverlay.cs
+++ b/osu.Game/Overlays/SocialOverlay.cs
@@ -36,7 +36,7 @@ namespace osu.Game.Overlays
private IEnumerable<User> users;
public IEnumerable<User> Users
{
- get { return users; }
+ get => users;
set
{
if (users?.Equals(value) ?? false)
diff --git a/osu.Game/Overlays/Toolbar/ToolbarButton.cs b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
index 32ab80d50f..ef8d54a69e 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarButton.cs
@@ -35,34 +35,25 @@ namespace osu.Game.Overlays.Toolbar
public FontAwesome Icon
{
- set { SetIcon(value); }
+ set => SetIcon(value);
}
public string Text
{
- get { return DrawableText.Text; }
- set
- {
- DrawableText.Text = value;
- }
+ get => DrawableText.Text;
+ set => DrawableText.Text = value;
}
public string TooltipMain
{
- get { return tooltip1.Text; }
- set
- {
- tooltip1.Text = value;
- }
+ get => tooltip1.Text;
+ set => tooltip1.Text = value;
}
public string TooltipSub
{
- get { return tooltip2.Text; }
- set
- {
- tooltip2.Text = value;
- }
+ get => tooltip2.Text;
+ set => tooltip2.Text = value;
}
protected virtual Anchor TooltipAnchor => Anchor.TopLeft;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs b/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
index 2e1e2c0df8..751045f61c 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarNotificationButton.cs
@@ -66,7 +66,7 @@ namespace osu.Game.Overlays.Toolbar
public int Count
{
- get { return count; }
+ get => count;
set
{
if (count == value)
diff --git a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
index fc6a54477c..ca86ce7aa7 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarOverlayToggleButton.cs
@@ -17,7 +17,7 @@ namespace osu.Game.Overlays.Toolbar
public OverlayContainer StateContainer
{
- get { return stateContainer; }
+ get => stateContainer;
set
{
stateContainer = value;
diff --git a/osu.Game/Overlays/Toolbar/ToolbarRulesetButton.cs b/osu.Game/Overlays/Toolbar/ToolbarRulesetButton.cs
index 07a53f0bae..3c6749d885 100644
--- a/osu.Game/Overlays/Toolbar/ToolbarRulesetButton.cs
+++ b/osu.Game/Overlays/Toolbar/ToolbarRulesetButton.cs
@@ -12,7 +12,7 @@ namespace osu.Game.Overlays.Toolbar
private RulesetInfo ruleset;
public RulesetInfo Ruleset
{
- get { return ruleset; }
+ get => ruleset;
set
{
ruleset = value;
diff --git a/osu.Game/Rulesets/UI/ModIcon.cs b/osu.Game/Rulesets/UI/ModIcon.cs
index 12b9134f92..9f80dea9f7 100644
--- a/osu.Game/Rulesets/UI/ModIcon.cs
+++ b/osu.Game/Rulesets/UI/ModIcon.cs
@@ -22,8 +22,8 @@ namespace osu.Game.Rulesets.UI
public FontAwesome Icon
{
- get { return modIcon.Icon; }
- set { modIcon.Icon = value; }
+ get => modIcon.Icon;
+ set => modIcon.Icon = value;
}
private readonly ModType type;
@@ -100,7 +100,7 @@ namespace osu.Game.Rulesets.UI
public bool Highlighted
{
- get { return highlighted; }
+ get => highlighted;
set
{
diff --git a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
index 8706cc6668..3a49d21b34 100644
--- a/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
+++ b/osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
@@ -15,7 +15,7 @@ namespace osu.Game.Screens.Backgrounds
public WorkingBeatmap Beatmap
{
- get { return beatmap; }
+ get => beatmap;
set
{
if (beatmap == value && beatmap != null)
diff --git a/osu.Game/Screens/Edit/BindableBeatDivisor.cs b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
index bea4d9a7a4..ea3b68e3bd 100644
--- a/osu.Game/Screens/Edit/BindableBeatDivisor.cs
+++ b/osu.Game/Screens/Edit/BindableBeatDivisor.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Edit
public override int Value
{
- get { return base.Value; }
+ get => base.Value;
set
{
if (!VALID_DIVISORS.Contains(value))
diff --git a/osu.Game/Screens/Edit/Components/RadioButtons/RadioButtonCollection.cs b/osu.Game/Screens/Edit/Components/RadioButtons/RadioButtonCollection.cs
index c6ecdde7f6..5ff846157d 100644
--- a/osu.Game/Screens/Edit/Components/RadioButtons/RadioButtonCollection.cs
+++ b/osu.Game/Screens/Edit/Components/RadioButtons/RadioButtonCollection.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Screens.Edit.Components.RadioButtons
private IReadOnlyList<RadioButton> items;
public IReadOnlyList<RadioButton> Items
{
- get { return items; }
+ get => items;
set
{
if (ReferenceEquals(items, value))
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs
index 806a55c931..5ded97393b 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/TimelineButton.cs
@@ -19,8 +19,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
public FontAwesome Icon
{
- get { return button.Icon; }
- set { button.Icon = value; }
+ get => button.Icon;
+ set => button.Icon = value;
}
private readonly IconButton button;
diff --git a/osu.Game/Screens/Menu/Button.cs b/osu.Game/Screens/Menu/Button.cs
index fc285fb724..a02c2a37fa 100644
--- a/osu.Game/Screens/Menu/Button.cs
+++ b/osu.Game/Screens/Menu/Button.cs
@@ -242,7 +242,7 @@ namespace osu.Game.Screens.Menu
public ButtonState State
{
- get { return state; }
+ get => state;
set
{
diff --git a/osu.Game/Screens/Menu/ButtonSystem.cs b/osu.Game/Screens/Menu/ButtonSystem.cs
index 42d67ceffc..1f68818669 100644
--- a/osu.Game/Screens/Menu/ButtonSystem.cs
+++ b/osu.Game/Screens/Menu/ButtonSystem.cs
@@ -206,7 +206,7 @@ namespace osu.Game.Screens.Menu
public ButtonSystemState State
{
- get { return state; }
+ get => state;
set
{
diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs
index e682d5f711..af697d37bd 100644
--- a/osu.Game/Screens/Menu/OsuLogo.cs
+++ b/osu.Game/Screens/Menu/OsuLogo.cs
@@ -62,7 +62,7 @@ namespace osu.Game.Screens.Menu
public bool Triangles
{
- set { colourAndTriangles.FadeTo(value ? 1 : 0, transition_length, Easing.OutQuint); }
+ set => colourAndTriangles.FadeTo(value ? 1 : 0, transition_length, Easing.OutQuint);
}
public bool BeatMatching = true;
@@ -71,8 +71,8 @@ namespace osu.Game.Screens.Menu
public bool Ripple
{
- get { return rippleContainer.Alpha > 0; }
- set { rippleContainer.FadeTo(value ? 1 : 0, transition_length, Easing.OutQuint); }
+ get => rippleContainer.Alpha > 0;
+ set => rippleContainer.FadeTo(value ? 1 : 0, transition_length, Easing.OutQuint);
}
private readonly Box flashLayer;
diff --git a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
index 14d66389ca..865a3f0496 100644
--- a/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
+++ b/osu.Game/Screens/Multi/Lounge/Components/DrawableRoom.cs
@@ -45,7 +45,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
private SelectionState state;
public SelectionState State
{
- get { return state; }
+ get => state;
set
{
if (value == state) return;
@@ -65,7 +65,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
private bool matchingFilter;
public bool MatchingFilter
{
- get { return matchingFilter; }
+ get => matchingFilter;
set
{
matchingFilter = value;
diff --git a/osu.Game/Screens/Play/Break/BlurredIcon.cs b/osu.Game/Screens/Play/Break/BlurredIcon.cs
index 04b87d123f..53b968959c 100644
--- a/osu.Game/Screens/Play/Break/BlurredIcon.cs
+++ b/osu.Game/Screens/Play/Break/BlurredIcon.cs
@@ -15,8 +15,8 @@ namespace osu.Game.Screens.Play.Break
public FontAwesome Icon
{
- set { icon.Icon = value; }
- get { return icon.Icon; }
+ set => icon.Icon = value;
+ get => icon.Icon;
}
public override Vector2 Size
@@ -27,7 +27,7 @@ namespace osu.Game.Screens.Play.Break
base.Size = value + BlurSigma * 2.5f;
ForceRedraw();
}
- get { return base.Size; }
+ get => base.Size;
}
public BlurredIcon()
diff --git a/osu.Game/Screens/Play/Break/GlowIcon.cs b/osu.Game/Screens/Play/Break/GlowIcon.cs
index 8843373ded..8d918cd225 100644
--- a/osu.Game/Screens/Play/Break/GlowIcon.cs
+++ b/osu.Game/Screens/Play/Break/GlowIcon.cs
@@ -16,7 +16,7 @@ namespace osu.Game.Screens.Play.Break
public override Vector2 Size
{
- get { return base.Size; }
+ get => base.Size;
set
{
blurredIcon.Size = spriteIcon.Size = value;
@@ -26,14 +26,14 @@ namespace osu.Game.Screens.Play.Break
public Vector2 BlurSigma
{
- get { return blurredIcon.BlurSigma; }
- set { blurredIcon.BlurSigma = value; }
+ get => blurredIcon.BlurSigma;
+ set => blurredIcon.BlurSigma = value;
}
public FontAwesome Icon
{
- get { return spriteIcon.Icon; }
- set { spriteIcon.Icon = blurredIcon.Icon = value; }
+ get => spriteIcon.Icon;
+ set => spriteIcon.Icon = blurredIcon.Icon = value;
}
public GlowIcon()
diff --git a/osu.Game/Screens/Play/GameplayMenuOverlay.cs b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
index bcd7452ba6..558c85a83e 100644
--- a/osu.Game/Screens/Play/GameplayMenuOverlay.cs
+++ b/osu.Game/Screens/Play/GameplayMenuOverlay.cs
@@ -184,7 +184,7 @@ namespace osu.Game.Screens.Play
private int selectionIndex
{
- get { return _selectionIndex; }
+ get => _selectionIndex;
set
{
if (_selectionIndex == value)
diff --git a/osu.Game/Screens/Play/HUD/ComboCounter.cs b/osu.Game/Screens/Play/HUD/ComboCounter.cs
index eb9db9745f..aeec0e7af0 100644
--- a/osu.Game/Screens/Play/HUD/ComboCounter.cs
+++ b/osu.Game/Screens/Play/HUD/ComboCounter.cs
@@ -83,7 +83,7 @@ namespace osu.Game.Screens.Play.HUD
/// </summary>
public virtual int DisplayedCount
{
- get { return displayedCount; }
+ get => displayedCount;
protected set
{
if (displayedCount.Equals(value))
@@ -95,7 +95,7 @@ namespace osu.Game.Screens.Play.HUD
private float textSize;
public float TextSize
{
- get { return textSize; }
+ get => textSize;
set
{
textSize = value;
diff --git a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs b/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
index f961e6b227..5e90de18f3 100644
--- a/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
+++ b/osu.Game/Screens/Play/HUD/StandardHealthDisplay.cs
@@ -44,14 +44,14 @@ namespace osu.Game.Screens.Play.HUD
public Color4 AccentColour
{
- get { return fill.Colour; }
- set { fill.Colour = value; }
+ get => fill.Colour;
+ set => fill.Colour = value;
}
private Color4 glowColour;
public Color4 GlowColour
{
- get { return glowColour; }
+ get => glowColour;
set
{
if (glowColour == value)
diff --git a/osu.Game/Screens/Play/KeyCounter.cs b/osu.Game/Screens/Play/KeyCounter.cs
index 406cd3810e..730ce8c568 100644
--- a/osu.Game/Screens/Play/KeyCounter.cs
+++ b/osu.Game/Screens/Play/KeyCounter.cs
@@ -29,7 +29,7 @@ namespace osu.Game.Screens.Play
private int countPresses;
public int CountPresses
{
- get { return countPresses; }
+ get => countPresses;
private set
{
if (countPresses != value)
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Play
private bool isLit;
public bool IsLit
{
- get { return isLit; }
+ get => isLit;
protected set
{
if (isLit != value)
diff --git a/osu.Game/Screens/Play/KeyCounterCollection.cs b/osu.Game/Screens/Play/KeyCounterCollection.cs
index 71e8da06ba..b37917ad44 100644
--- a/osu.Game/Screens/Play/KeyCounterCollection.cs
+++ b/osu.Game/Screens/Play/KeyCounterCollection.cs
@@ -60,7 +60,7 @@ namespace osu.Game.Screens.Play
private bool isCounting = true;
public bool IsCounting
{
- get { return isCounting; }
+ get => isCounting;
set
{
if (value == isCounting) return;
@@ -74,7 +74,7 @@ namespace osu.Game.Screens.Play
private int fadeTime;
public int FadeTime
{
- get { return fadeTime; }
+ get => fadeTime;
set
{
if (value != fadeTime)
@@ -89,7 +89,7 @@ namespace osu.Game.Screens.Play
private Color4 keyDownTextColor = Color4.DarkGray;
public Color4 KeyDownTextColor
{
- get { return keyDownTextColor; }
+ get => keyDownTextColor;
set
{
if (value != keyDownTextColor)
@@ -104,7 +104,7 @@ namespace osu.Game.Screens.Play
private Color4 keyUpTextColor = Color4.White;
public Color4 KeyUpTextColor
{
- get { return keyUpTextColor; }
+ get => keyUpTextColor;
set
{
if (value != keyUpTextColor)
diff --git a/osu.Game/Screens/Play/PauseContainer.cs b/osu.Game/Screens/Play/PauseContainer.cs
index 0222cefdd3..54f3a4b2c1 100644
--- a/osu.Game/Screens/Play/PauseContainer.cs
+++ b/osu.Game/Screens/Play/PauseContainer.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Play
protected override Container<Drawable> Content => content;
- public int Retries { set { pauseOverlay.Retries = value; } }
+ public int Retries { set => pauseOverlay.Retries = value; }
public bool CanPause => (CheckCanPause?.Invoke() ?? true) && Time.Current >= lastPauseActionTime + pause_cooldown;
public bool IsResuming { get; private set; }
diff --git a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
index 49bcf0b8dc..ffe239c52a 100644
--- a/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
+++ b/osu.Game/Screens/Play/PlayerSettings/PlayerSettingsGroup.cs
@@ -34,7 +34,7 @@ namespace osu.Game.Screens.Play.PlayerSettings
public bool Expanded
{
- get { return expanded; }
+ get => expanded;
set
{
if (expanded == value) return;
diff --git a/osu.Game/Screens/Play/SkipOverlay.cs b/osu.Game/Screens/Play/SkipOverlay.cs
index f5983029e2..010d9228de 100644
--- a/osu.Game/Screens/Play/SkipOverlay.cs
+++ b/osu.Game/Screens/Play/SkipOverlay.cs
@@ -158,7 +158,7 @@ namespace osu.Game.Screens.Play
public Visibility State
{
- get { return state; }
+ get => state;
set
{
bool stateChanged = value != state;
diff --git a/osu.Game/Screens/Play/SongProgress.cs b/osu.Game/Screens/Play/SongProgress.cs
index 443df27b42..ea9f1860c1 100644
--- a/osu.Game/Screens/Play/SongProgress.cs
+++ b/osu.Game/Screens/Play/SongProgress.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Screens.Play
public override bool HandlePositionalInput => AllowSeeking;
private IClock audioClock;
- public IClock AudioClock { set { audioClock = info.AudioClock = value; } }
+ public IClock AudioClock { set => audioClock = info.AudioClock = value; }
private double lastHitTime => ((objects.Last() as IHasEndTime)?.EndTime ?? objects.Last().StartTime) + 1;
@@ -117,10 +117,7 @@ namespace osu.Game.Screens.Play
public bool AllowSeeking
{
- get
- {
- return allowSeeking;
- }
+ get => allowSeeking;
set
{
diff --git a/osu.Game/Screens/Play/SongProgressBar.cs b/osu.Game/Screens/Play/SongProgressBar.cs
index ee9d711d54..2e7d452fe7 100644
--- a/osu.Game/Screens/Play/SongProgressBar.cs
+++ b/osu.Game/Screens/Play/SongProgressBar.cs
@@ -20,22 +20,22 @@ namespace osu.Game.Screens.Play
public Color4 FillColour
{
- set { fill.Colour = value; }
+ set => fill.Colour = value;
}
public double StartTime
{
- set { CurrentNumber.MinValue = value; }
+ set => CurrentNumber.MinValue = value;
}
public double EndTime
{
- set { CurrentNumber.MaxValue = value; }
+ set => CurrentNumber.MaxValue = value;
}
public double CurrentTime
{
- set { CurrentNumber.Value = value; }
+ set => CurrentNumber.Value = value;
}
public SongProgressBar(float barHeight, float handleBarHeight, Vector2 handleSize)
diff --git a/osu.Game/Screens/Play/SongProgressInfo.cs b/osu.Game/Screens/Play/SongProgressInfo.cs
index d24e484001..bf4372144f 100644
--- a/osu.Game/Screens/Play/SongProgressInfo.cs
+++ b/osu.Game/Screens/Play/SongProgressInfo.cs
@@ -29,8 +29,8 @@ namespace osu.Game.Screens.Play
public IClock AudioClock;
- public double StartTime { set { startTime = value; } }
- public double EndTime { set { endTime = value; } }
+ public double StartTime { set => startTime = value; }
+ public double EndTime { set => endTime = value; }
[BackgroundDependencyLoader]
private void load(OsuColour colours)
diff --git a/osu.Game/Screens/Play/SquareGraph.cs b/osu.Game/Screens/Play/SquareGraph.cs
index 15102edc42..c9b22725f3 100644
--- a/osu.Game/Screens/Play/SquareGraph.cs
+++ b/osu.Game/Screens/Play/SquareGraph.cs
@@ -28,7 +28,7 @@ namespace osu.Game.Screens.Play
public int Progress
{
- get { return progress; }
+ get => progress;
set
{
if (value == progress) return;
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Play
public int[] Values
{
- get { return values; }
+ get => values;
set
{
if (value == values) return;
@@ -56,7 +56,7 @@ namespace osu.Game.Screens.Play
public Color4 FillColour
{
- get { return fillColour; }
+ get => fillColour;
set
{
if (value == fillColour) return;
@@ -193,7 +193,7 @@ namespace osu.Game.Screens.Play
public float Filled
{
- get { return filled; }
+ get => filled;
set
{
if (value == filled) return;
@@ -207,7 +207,7 @@ namespace osu.Game.Screens.Play
public ColumnState State
{
- get { return state; }
+ get => state;
set
{
if (value == state) return;
diff --git a/osu.Game/Screens/Select/BeatmapDetailArea.cs b/osu.Game/Screens/Select/BeatmapDetailArea.cs
index 03e94c86b6..e3580f5104 100644
--- a/osu.Game/Screens/Select/BeatmapDetailArea.cs
+++ b/osu.Game/Screens/Select/BeatmapDetailArea.cs
@@ -22,10 +22,7 @@ namespace osu.Game.Screens.Select
private WorkingBeatmap beatmap;
public WorkingBeatmap Beatmap
{
- get
- {
- return beatmap;
- }
+ get => beatmap;
set
{
beatmap = value;
diff --git a/osu.Game/Screens/Select/BeatmapDetails.cs b/osu.Game/Screens/Select/BeatmapDetails.cs
index 9f9263927e..665f9b7255 100644
--- a/osu.Game/Screens/Select/BeatmapDetails.cs
+++ b/osu.Game/Screens/Select/BeatmapDetails.cs
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Select
private BeatmapInfo beatmap;
public BeatmapInfo Beatmap
{
- get { return beatmap; }
+ get => beatmap;
set
{
if (value == beatmap) return;
diff --git a/osu.Game/Screens/Select/Details/AdvancedStats.cs b/osu.Game/Screens/Select/Details/AdvancedStats.cs
index 2d897148c1..4026bb8eb3 100644
--- a/osu.Game/Screens/Select/Details/AdvancedStats.cs
+++ b/osu.Game/Screens/Select/Details/AdvancedStats.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Select.Details
private BeatmapInfo beatmap;
public BeatmapInfo Beatmap
{
- get { return beatmap; }
+ get => beatmap;
set
{
if (value == beatmap) return;
@@ -83,14 +83,14 @@ namespace osu.Game.Screens.Select.Details
public string Title
{
- get { return name.Text; }
- set { name.Text = value; }
+ get => name.Text;
+ set => name.Text = value;
}
private float difficultyValue;
public float Value
{
- get { return difficultyValue; }
+ get => difficultyValue;
set
{
difficultyValue = value;
@@ -101,8 +101,8 @@ namespace osu.Game.Screens.Select.Details
public Color4 AccentColour
{
- get { return bar.AccentColour; }
- set { bar.AccentColour = value; }
+ get => bar.AccentColour;
+ set => bar.AccentColour = value;
}
public StatisticRow(float maxValue = 10, bool forceDecimalPlaces = false)
diff --git a/osu.Game/Screens/Select/Details/FailRetryGraph.cs b/osu.Game/Screens/Select/Details/FailRetryGraph.cs
index 32067a69a0..f7d5e77f18 100644
--- a/osu.Game/Screens/Select/Details/FailRetryGraph.cs
+++ b/osu.Game/Screens/Select/Details/FailRetryGraph.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Select.Details
private BeatmapMetrics metrics;
public BeatmapMetrics Metrics
{
- get { return metrics; }
+ get => metrics;
set
{
if (value == metrics) return;
diff --git a/osu.Game/Screens/Select/Details/UserRatings.cs b/osu.Game/Screens/Select/Details/UserRatings.cs
index db796ba5d2..19855e5e23 100644
--- a/osu.Game/Screens/Select/Details/UserRatings.cs
+++ b/osu.Game/Screens/Select/Details/UserRatings.cs
@@ -24,7 +24,7 @@ namespace osu.Game.Screens.Select.Details
public BeatmapMetrics Metrics
{
- get { return metrics; }
+ get => metrics;
set
{
if (value == metrics) return;
diff --git a/osu.Game/Screens/Select/FilterControl.cs b/osu.Game/Screens/Select/FilterControl.cs
index 72a15e37e1..bd0b0dd5cd 100644
--- a/osu.Game/Screens/Select/FilterControl.cs
+++ b/osu.Game/Screens/Select/FilterControl.cs
@@ -32,7 +32,7 @@ namespace osu.Game.Screens.Select
public SortMode Sort
{
- get { return sort; }
+ get => sort;
set
{
if (sort != value)
@@ -47,7 +47,7 @@ namespace osu.Game.Screens.Select
public GroupMode Group
{
- get { return group; }
+ get => group;
set
{
if (group != value)
diff --git a/osu.Game/Screens/Select/FilterCriteria.cs b/osu.Game/Screens/Select/FilterCriteria.cs
index 4c3b77d483..140010ff54 100644
--- a/osu.Game/Screens/Select/FilterCriteria.cs
+++ b/osu.Game/Screens/Select/FilterCriteria.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Screens.Select
public string SearchText
{
- get { return searchText; }
+ get => searchText;
set
{
searchText = value;
diff --git a/osu.Game/Screens/Select/FooterButton.cs b/osu.Game/Screens/Select/FooterButton.cs
index aa8b48588a..68ac1cc662 100644
--- a/osu.Game/Screens/Select/FooterButton.cs
+++ b/osu.Game/Screens/Select/FooterButton.cs
@@ -20,7 +20,7 @@ namespace osu.Game.Screens.Select
public string Text
{
- get { return spriteText?.Text; }
+ get => spriteText?.Text;
set
{
if (spriteText != null)
@@ -31,7 +31,7 @@ namespace osu.Game.Screens.Select
private Color4 deselectedColour;
public Color4 DeselectedColour
{
- get { return deselectedColour; }
+ get => deselectedColour;
set
{
deselectedColour = value;
@@ -43,7 +43,7 @@ namespace osu.Game.Screens.Select
private Color4 selectedColour;
public Color4 SelectedColour
{
- get { return selectedColour; }
+ get => selectedColour;
set
{
selectedColour = value;
diff --git a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
index 4f1fd0188e..adf989ee62 100644
--- a/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
+++ b/osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Screens.Select.Leaderboards
public BeatmapInfo Beatmap
{
- get { return beatmap; }
+ get => beatmap;
set
{
if (beatmap == value)
diff --git a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
index 6960739987..758e1c24c3 100644
--- a/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
+++ b/osu.Game/Screens/Select/Options/BeatmapOptionsButton.cs
@@ -28,26 +28,26 @@ namespace osu.Game.Screens.Select.Options
public Color4 ButtonColour
{
- get { return background.Colour; }
- set { background.Colour = value; }
+ get => background.Colour;
+ set => background.Colour = value;
}
public FontAwesome Icon
{
- get { return iconText.Icon; }
- set { iconText.Icon = value; }
+ get => iconText.Icon;
+ set => iconText.Icon = value;
}
public string FirstLineText
{
- get { return firstLine.Text; }
- set { firstLine.Text = value; }
+ get => firstLine.Text;
+ set => firstLine.Text = value;
}
public string SecondLineText
{
- get { return secondLine.Text; }
- set { secondLine.Text = value; }
+ get => secondLine.Text;
+ set => secondLine.Text = value;
}
public Key? HotKey;
diff --git a/osu.Game/Screens/Tournament/Components/VisualiserContainer.cs b/osu.Game/Screens/Tournament/Components/VisualiserContainer.cs
index 854eb809e8..6b0888313b 100644
--- a/osu.Game/Screens/Tournament/Components/VisualiserContainer.cs
+++ b/osu.Game/Screens/Tournament/Components/VisualiserContainer.cs
@@ -19,7 +19,7 @@ namespace osu.Game.Screens.Tournament.Components
/// </summary>
public int Lines
{
- get { return allLines.Count; }
+ get => allLines.Count;
set
{
while (value > allLines.Count)
diff --git a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
index da2fc7fb5b..36b6cf425c 100644
--- a/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
+++ b/osu.Game/Screens/Tournament/ScrollingTeamContainer.cs
@@ -86,7 +86,7 @@ namespace osu.Game.Screens.Tournament
private ScrollState _scrollState;
private ScrollState scrollState
{
- get { return _scrollState; }
+ get => _scrollState;
set
{
@@ -328,7 +328,7 @@ namespace osu.Game.Screens.Tournament
private bool selected;
public bool Selected
{
- get { return selected; }
+ get => selected;
set
{
diff --git a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
index c92fe9812e..1021529ab2 100644
--- a/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
+++ b/osu.Game/Storyboards/Drawables/DrawableStoryboard.cs
@@ -22,7 +22,7 @@ namespace osu.Game.Storyboards.Drawables
private bool passing = true;
public bool Passing
{
- get { return passing; }
+ get => passing;
set
{
if (passing == value) return;
diff --git a/osu.Game/Users/Country.cs b/osu.Game/Users/Country.cs
index e17afbc77f..4007bf3991 100644
--- a/osu.Game/Users/Country.cs
+++ b/osu.Game/Users/Country.cs
@@ -35,7 +35,7 @@ namespace osu.Game.Users
private Country country;
public Country Country
{
- get { return country; }
+ get => country;
set
{
if (value == country)
diff --git a/osu.Game/Users/UpdateableAvatar.cs b/osu.Game/Users/UpdateableAvatar.cs
index 4039e45e3d..cefb91797b 100644
--- a/osu.Game/Users/UpdateableAvatar.cs
+++ b/osu.Game/Users/UpdateableAvatar.cs
@@ -23,7 +23,7 @@ namespace osu.Game.Users
public User User
{
- get { return user; }
+ get => user;
set
{
if (user?.Id == value?.Id)
diff --git a/osu.Game/Users/User.cs b/osu.Game/Users/User.cs
index 745ebb75fc..292ac90245 100644
--- a/osu.Game/Users/User.cs
+++ b/osu.Game/Users/User.cs
@@ -34,8 +34,8 @@ namespace osu.Game.Users
[JsonProperty(@"cover_url")]
public string CoverUrl
{
- get { return Cover?.Url; }
- set { Cover = new UserCover { Url = value }; }
+ get => Cover?.Url;
+ set => Cover = new UserCover { Url = value };
}
[JsonProperty(@"cover")]
diff --git a/osu.sln.DotSettings b/osu.sln.DotSettings
index ad0d8a55a2..9ba4e57f6c 100644
--- a/osu.sln.DotSettings
+++ b/osu.sln.DotSettings
@@ -6,7 +6,12 @@
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=2A66DD92_002DADB1_002D4994_002D89E2_002DC94E04ACDA0D_002Fd_003AMigrations/@EntryIndexedValue">ExplicitlyExcluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=D9A367C9_002D4C1A_002D489F_002D9B05_002DA0CEA2B53B58/@EntryIndexedValue">ExplicitlyExcluded</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/AnalysisEnabled/@EntryValue">SOLUTION</s:String>
- <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeAccessorOwnerBody/@EntryIndexedValue">HINT</s:String>
+ <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeAccessorOwnerBody/@EntryIndexedValue">WARNING</s:String>
+ <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeConstructorOrDestructorBody/@EntryIndexedValue">WARNING</s:String>
+ <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeLocalFunctionBody/@EntryIndexedValue">HINT</s:String>
+
+ <s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeMethodOrOperatorBody/@EntryIndexedValue">HINT</s:String>
+
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeModifiersOrder/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexedValue"></s:String>
<s:Boolean x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=ArrangeRedundantParentheses/@EntryIndexRemoved">True</s:Boolean>
@@ -168,6 +173,9 @@
<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=VirtualMemberNeverOverridden_002ELocal/@EntryIndexedValue">WARNING</s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/Profiles/=Code_0020Cleanup_0020_0028peppy_0029/@EntryIndexedValue"><?xml version="1.0" encoding="utf-16"?><Profile name="Code Cleanup (peppy)"><CSArrangeThisQualifier>True</CSArrangeThisQualifier><CSUseVar><BehavourStyle>CAN_CHANGE_TO_EXPLICIT</BehavourStyle><LocalVariableStyle>ALWAYS_EXPLICIT</LocalVariableStyle><ForeachVariableStyle>ALWAYS_EXPLICIT</ForeachVariableStyle></CSUseVar><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><CSUpdateFileHeader>True</CSUpdateFileHeader><CSCodeStyleAttributes ArrangeTypeAccessModifier="False" ArrangeTypeMemberAccessModifier="False" SortModifiers="True" RemoveRedundantParentheses="True" AddMissingParentheses="False" ArrangeBraces="False" ArrangeAttributes="False" ArrangeArgumentsStyle="False" /><XAMLCollapseEmptyTags>False</XAMLCollapseEmptyTags><CSFixBuiltinTypeReferences>True</CSFixBuiltinTypeReferences><CSArrangeQualifiers>True</CSArrangeQualifiers></Profile></s:String>
<s:String x:Key="/Default/CodeStyle/CodeCleanup/RecentlyUsedProfile/@EntryValue">Code Cleanup (peppy)</s:String>
+ <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/LOCAL_FUNCTION_BODY/@EntryValue">ExpressionBody</s:String>
+ <s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/METHOD_OR_OPERATOR_BODY/@EntryValue">ExpressionBody</s:String>
+ <s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpCodeStyle/USE_HEURISTICS_FOR_BODY_STYLE/@EntryValue">False</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_LINQ_QUERY/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_CALLS_CHAIN/@EntryValue">True</s:Boolean>
<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/ALIGN_MULTILINE_EXTENDS_LIST/@EntryValue">True</s:Boolean>