use darker colours for default background on wiki page

Flutterish · Dec 31, 2021 · eff10c3 · eff10c3
1 parent b166267
commit eff10c3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/osu.Game.Rulesets.RurusettoAddon/UI/Info/InfoTab.cs b/osu.Game.Rulesets.RurusettoAddon/UI/Info/InfoTab.cs
@@ -115,13 +115,15 @@ protected override void LoadContent () {
 							new RulesetLogo( ruleset ) {
 								Height = 170f * 14 / 20,
 								Width = 170f * 14 / 20,
-								Margin = new MarginPadding { Right = 16 }
+								Margin = new MarginPadding { Right = 16 },
+								UseDarkerBackground = true
 							},
 							new DrawableRurusettoUser( Users.GetUserIdentity( ruleset.Owner ), ruleset.IsVerified ) {
 								Anchor = Anchor.BottomLeft,
 								Origin = Anchor.BottomLeft,
 								Height = 64f * 14 / 20,
-								Margin = new MarginPadding { Bottom = 4 }
+								Margin = new MarginPadding { Bottom = 4 },
+								UseDarkerBackground = true
 							}
 						},
 						Margin = new MarginPadding { Bottom = 20 }
@@ -137,7 +139,8 @@ protected override void LoadContent () {
 								Height = 40f * 14 / 20,
 								Width = 200f * 14 / 20,
 								Anchor = Anchor.CentreRight,
-								Origin = Anchor.CentreRight
+								Origin = Anchor.CentreRight,
+								UseDarkerBackground = true
 							}
 						}
 					}

diff --git a/osu.Game.Rulesets.RurusettoAddon/UI/RulesetDownloadButton.cs b/osu.Game.Rulesets.RurusettoAddon/UI/RulesetDownloadButton.cs
@@ -25,6 +25,7 @@ public class RulesetDownloadButton : GrayButton, IHasContextMenu {
 		LoadingSpinner spinner;
 		RulesetIdentity ruleset;
 		Warning warning;
+		public bool UseDarkerBackground { get; init; }
 		public RulesetDownloadButton ( RulesetIdentity ruleset ) : base( FontAwesome.Solid.Download ) {
 			this.ruleset = ruleset;
 			Action = onClick;
@@ -139,6 +140,7 @@ private void updateVisuals () {
 				spinner.Alpha = 0;
 				Icon.Alpha = 1;
 				this.FadeTo( 0.6f, 200 );
+				Background.FadeColour( UseDarkerBackground ? overlayColours.Background4 : overlayColours.Background3, 200, Easing.InOutExpo );
 				TooltipText = "Unavailable Online";
 				warning.FadeOut( 200 );
 				Icon.Scale = new osuTK.Vector2( 1.5f );
@@ -150,7 +152,7 @@ private void updateVisuals () {
 				spinner.Alpha = 0;
 				Icon.Alpha = 1;
 				this.FadeTo( 1f, 200 );
-				Background.FadeColour( overlayColours.Background3, 200, Easing.InOutExpo );
+				Background.FadeColour( UseDarkerBackground ? overlayColours.Background4 : overlayColours.Background3, 200, Easing.InOutExpo );
 				Icon.Scale = new osuTK.Vector2( 1.5f );
 				Icon.Icon = FontAwesome.Solid.Download;
 				TooltipText = "Download";

diff --git a/osu.Game.Rulesets.RurusettoAddon/UI/RulesetLogo.cs b/osu.Game.Rulesets.RurusettoAddon/UI/RulesetLogo.cs
@@ -11,13 +11,14 @@ public class RulesetLogo : CompositeDrawable {
 		protected RurusettoAPI API { get; private set; }
 
 		RulesetIdentity ruleset;
+		public bool UseDarkerBackground { get; init; }
 		public RulesetLogo ( RulesetIdentity ruleset ) {
 			this.ruleset = ruleset;
 		}
 
 		[BackgroundDependencyLoader]
 		private void load ( OverlayColourProvider colours ) {
-			var color = colours.Background3;
+			var color = UseDarkerBackground ? colours.Background4 : colours.Background3;
 
 			InternalChildren = new Drawable[] {
 				new Circle {

diff --git a/osu.Game.Rulesets.RurusettoAddon/UI/Users/DrawableRurusettoUser.cs b/osu.Game.Rulesets.RurusettoAddon/UI/Users/DrawableRurusettoUser.cs
@@ -38,7 +38,7 @@ public class DrawableRurusettoUser : CompositeDrawable, IHasTooltip {
 		private bool isVerified;
 		Drawable verifiedDrawable;
 		UserProfile profile;
-
+		public bool UseDarkerBackground { get; init; }
 		public DrawableRurusettoUser ( UserIdentity user, bool isVerified = false ) {
 			this.isVerified = isVerified;
 			this.user = user;
@@ -50,7 +50,7 @@ public DrawableRurusettoUser ( UserIdentity user, bool isVerified = false ) {
 
 		[BackgroundDependencyLoader]
 		private void load () {
-			var color = colours.Background3;
+			var color = UseDarkerBackground ? colours.Background4 : colours.Background3;
 
 			AddInternal( new HoverClickSounds( HoverSampleSet.Button ) );
 			AddInternal( usernameFlow = new FillFlowContainer {