sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into more-inspections

Browse Source
This commit is contained in:
Dean Herbert
2019-02-28 14:32:57 +09:00
committed by GitHub
parent 26d53d06a9 9fa8e6f3b9
commit 0788a7e9f1
130 changed files with 290 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/Notifications/Notification.cs
View File

@ -206,7 +206,7 @@ namespace osu.Game.Overlays.Notifications
public bool Pulsate
{
get { return pulsate; }
get => pulsate;
set
{
if (pulsate == value) return;

8
osu.Game/Overlays/Notifications/NotificationSection.cs
View File

@ -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();
}
}

16
osu.Game/Overlays/Notifications/ProgressNotification.cs
View File

@ -17,15 +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()
@ -38,9 +38,8 @@ namespace osu.Game.Overlays.Notifications
public virtual ProgressNotificationState State
{
get { return state; }
set
{
get => state;
set =>
Schedule(() =>
{
bool stateChanged = state != value;
@ -79,7 +78,6 @@ namespace osu.Game.Overlays.Notifications
}
}
});
}
}
private ProgressNotificationState state;
@ -178,7 +176,7 @@ namespace osu.Game.Overlays.Notifications
public float Progress
{
get { return progress; }
get => progress;
set
{
if (progress == value) return;
@ -192,7 +190,7 @@ namespace osu.Game.Overlays.Notifications
public bool Active
{
get { return active; }
get => active;
set
{
active = value;

7
osu.Game/Overlays/Notifications/SimpleNotification.cs
View File

@ -18,7 +18,7 @@ namespace osu.Game.Overlays.Notifications
public string Text
{
get { return text; }
get => text;
set
{
text = value;
@ -30,7 +30,7 @@ namespace osu.Game.Overlays.Notifications
public FontAwesome Icon
{
get { return icon; }
get => icon;
set
{
icon = value;
@ -78,8 +78,7 @@ namespace osu.Game.Overlays.Notifications
public override bool Read
{
get { return base.Read; }
get => base.Read;
set
{
if (value == base.Read) return;