h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 04:07:25 +08:00
Code Issues Releases Wiki Activity

Fix nub naming in OsuCheckbox.cs and associated classes

Browse Source
This commit is contained in:
mk56-spn 2023-01-26 16:10:02 +01:00
parent 76146b5c53
commit 091cc155d3
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
osu.Game/Graphics/UserInterface/OsuCheckbox.cs
View File

@ -41,7 +41,7 @@ namespace osu.Game.Graphics.UserInterface
} }
} }
protected readonly NormalNub NormalNub; protected readonly NormalNub Nub;
protected readonly OsuTextFlowContainer LabelTextFlowContainer; protected readonly OsuTextFlowContainer LabelTextFlowContainer;
private Sample sampleChecked; private Sample sampleChecked;
@ -61,28 +61,28 @@ namespace osu.Game.Graphics.UserInterface
AutoSizeAxes = Axes.Y, AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
}, },
NormalNub = new NormalNub(), Nub = new NormalNub(),
new HoverSounds() new HoverSounds()
}; };
if (nubOnRight) if (nubOnRight)
{ {
NormalNub.Anchor = Anchor.CentreRight; Nub.Anchor = Anchor.CentreRight;
NormalNub.Origin = Anchor.CentreRight; Nub.Origin = Anchor.CentreRight;
NormalNub.Margin = new MarginPadding { Right = nub_padding }; Nub.Margin = new MarginPadding { Right = nub_padding };
LabelTextFlowContainer.Padding = new MarginPadding { Right = NormalNub.EXPANDED_SIZE + nub_padding * 2 }; LabelTextFlowContainer.Padding = new MarginPadding { Right = NormalNub.EXPANDED_SIZE + nub_padding * 2 };
} }
else else
{ {
NormalNub.Anchor = Anchor.CentreLeft; Nub.Anchor = Anchor.CentreLeft;
NormalNub.Origin = Anchor.CentreLeft; Nub.Origin = Anchor.CentreLeft;
NormalNub.Margin = new MarginPadding { Left = nub_padding }; Nub.Margin = new MarginPadding { Left = nub_padding };
LabelTextFlowContainer.Padding = new MarginPadding { Left = NormalNub.EXPANDED_SIZE + nub_padding * 2 }; LabelTextFlowContainer.Padding = new MarginPadding { Left = NormalNub.EXPANDED_SIZE + nub_padding * 2 };
} }
NormalNub.Current.BindTo(Current); Nub.Current.BindTo(Current);
Current.DisabledChanged += disabled => LabelTextFlowContainer.Alpha = NormalNub.Alpha = disabled ? 0.3f : 1; Current.DisabledChanged += disabled => LabelTextFlowContainer.Alpha = Nub.Alpha = disabled ? 0.3f : 1;
} }
/// <summary> /// <summary>
@ -101,13 +101,13 @@ namespace osu.Game.Graphics.UserInterface
protected override bool OnHover(HoverEvent e) protected override bool OnHover(HoverEvent e)
{ {
NormalNub.Glowing = true; Nub.Glowing = true;
return base.OnHover(e); return base.OnHover(e);
} }
protected override void OnHoverLost(HoverLostEvent e) protected override void OnHoverLost(HoverLostEvent e)
{ {
NormalNub.Glowing = false; Nub.Glowing = false;
base.OnHoverLost(e); base.OnHoverLost(e);
} }

6
osu.Game/Graphics/UserInterfaceV2/OsuDirectorySelectorHiddenToggle.cs
View File

@ -30,9 +30,9 @@ namespace osu.Game.Graphics.UserInterfaceV2
if (overlayColourProvider != null) if (overlayColourProvider != null)
return; return;
NormalNub.AccentColour = colours.GreySeaFoamLighter; Nub.AccentColour = colours.GreySeaFoamLighter;
NormalNub.GlowingAccentColour = Color4.White; Nub.GlowingAccentColour = Color4.White;
NormalNub.GlowColour = Color4.White; Nub.GlowColour = Color4.White;
} }
} }
} }

6
osu.Game/Overlays/Mods/ModColumn.cs
View File

@ -267,9 +267,9 @@ namespace osu.Game.Overlays.Mods
private void updateState() private void updateState()
{ {
NormalNub.AccentColour = AccentColour; Nub.AccentColour = AccentColour;
NormalNub.GlowingAccentColour = AccentHoverColour; Nub.GlowingAccentColour = AccentHoverColour;
NormalNub.GlowColour = AccentHoverColour.Opacity(0.2f); Nub.GlowColour = AccentHoverColour.Opacity(0.2f);
} }
protected override void OnUserChange(bool value) protected override void OnUserChange(bool value)

6
osu.Game/Screens/Play/PlayerSettings/PlayerCheckbox.cs
View File

@ -18,9 +18,9 @@ namespace osu.Game.Screens.Play.PlayerSettings
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours) private void load(OsuColour colours)
{ {
NormalNub.AccentColour = colours.Yellow; Nub.AccentColour = colours.Yellow;
NormalNub.GlowingAccentColour = colours.YellowLighter; Nub.GlowingAccentColour = colours.YellowLighter;
NormalNub.GlowColour = colours.YellowDark; Nub.GlowColour = colours.YellowDark;
} }
} }
} }