RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move colouring to full icon content rather than background

This commit is contained in:
Dean Herbert 2022-08-30 17:40:35 +09:00
parent 0f203531d9
commit 09aa3e065d
8 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Desktop/Security/ElevatedPrivilegesChecker.cs
View File

@ -76,7 +76,7 @@ public ElevatedPrivilegesNotification()
private void load(OsuColour colours)
{
Icon = FontAwesome.Solid.ShieldAlt;
IconBackground.Colour = colours.YellowDark;
IconContent.Colour = colours.YellowDark;
}
}
}

2
osu.Game/Database/TooManyDownloadsNotification.cs
View File

@ -20,7 +20,7 @@ public TooManyDownloadsNotification()
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
IconBackground.Colour = colours.RedDark;
IconContent.Colour = colours.RedDark;
}
}
}

2
osu.Game/Online/Chat/MessageNotifier.cs
View File

@ -174,7 +174,7 @@ protected HighlightMessageNotification(Message message, Channel channel)
[BackgroundDependencyLoader]
private void load(OsuColour colours, ChatOverlay chatOverlay, INotificationOverlay notificationOverlay)
{
IconBackground.Colour = colours.PurpleDark;
IconContent.Colour = colours.PurpleDark;
Activated = delegate
{

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

@ -20,7 +20,7 @@ public ProgressCompletionNotification()
[BackgroundDependencyLoader]
private void load(OsuColour colours)
{
IconBackground.Colour = ColourInfo.GradientVertical(colours.GreenDark, colours.GreenLight);
IconContent.Colour = ColourInfo.GradientVertical(colours.GreenDark, colours.GreenLight);
}
}
}

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

@ -103,7 +103,7 @@ private void updateState()
Light.Pulsate = false;
progressBar.Active = false;
iconBackground.FadeColour(ColourInfo.GradientVertical(colourQueued, colourQueued.Lighten(0.5f)), colour_fade_duration);
IconContent.FadeColour(ColourInfo.GradientVertical(colourQueued, colourQueued.Lighten(0.5f)), colour_fade_duration);
loadingSpinner.Show();
break;
@ -112,14 +112,14 @@ private void updateState()
Light.Pulsate = true;
progressBar.Active = true;
iconBackground.FadeColour(ColourInfo.GradientVertical(colourActive, colourActive.Lighten(0.5f)), colour_fade_duration);
IconContent.FadeColour(ColourInfo.GradientVertical(colourActive, colourActive.Lighten(0.5f)), colour_fade_duration);
loadingSpinner.Show();
break;
case ProgressNotificationState.Cancelled:
cancellationTokenSource.Cancel();
iconBackground.FadeColour(ColourInfo.GradientVertical(Color4.Gray, Color4.Gray.Lighten(0.5f)), colour_fade_duration);
IconContent.FadeColour(ColourInfo.GradientVertical(Color4.Gray, Color4.Gray.Lighten(0.5f)), colour_fade_duration);
loadingSpinner.Hide();
var icon = new SpriteIcon
@ -168,7 +168,6 @@ protected void Completed()
private Color4 colourActive;
private Color4 colourCancelled;
private Box iconBackground = null!;
private LoadingSpinner loadingSpinner = null!;
private readonly TextFlowContainer textDrawable;
@ -206,10 +205,10 @@ private void load(OsuColour colours)
IconContent.AddRange(new Drawable[]
{
iconBackground = new Box
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = Color4.White,
Colour = colourProvider.Background5,
},
loadingSpinner = new LoadingSpinner
{

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

@ -41,8 +41,6 @@ public IconUsage Icon
}
}
protected Box IconBackground = null!;
private TextFlowContainer? textDrawable;
private SpriteIcon? iconDrawable;
@ -54,7 +52,7 @@ private void load(OsuColour colours, OverlayColourProvider colourProvider)
IconContent.AddRange(new Drawable[]
{
IconBackground = new Box
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = colourProvider.Background5,

4
osu.Game/Screens/Play/PlayerLoader.cs
View File

@ -530,7 +530,7 @@ public MutedNotification()
private void load(OsuColour colours, AudioManager audioManager, INotificationOverlay notificationOverlay, VolumeOverlay volumeOverlay)
{
Icon = FontAwesome.Solid.VolumeMute;
IconBackground.Colour = colours.RedDark;
IconContent.Colour = colours.RedDark;
Activated = delegate
{
@ -584,7 +584,7 @@ public BatteryWarningNotification()
private void load(OsuColour colours, INotificationOverlay notificationOverlay)
{
Icon = FontAwesome.Solid.BatteryQuarter;
IconBackground.Colour = colours.RedDark;
IconContent.Colour = colours.RedDark;
Activated = delegate
{

2
osu.Game/Updater/UpdateManager.cs
View File

@ -99,7 +99,7 @@ public UpdateCompleteNotification(string version)
private void load(OsuColour colours, ChangelogOverlay changelog, INotificationOverlay notificationOverlay)
{
Icon = FontAwesome.Solid.CheckSquare;
IconBackground.Colour = colours.BlueDark;
IconContent.Colour = colours.BlueDark;
Activated = delegate
{