mirror of
https://github.com/ppy/osu.git
synced 2026-06-09 07:33:39 +08:00
Merge pull request #35757 from peppy/settings-wank
Adjust settings buttons and general section to feel better
This commit is contained in:
@@ -178,7 +178,8 @@ namespace osu.Game.Graphics.UserInterfaceV2
|
||||
Size = new Vector2(70);
|
||||
|
||||
Masking = true;
|
||||
CornerRadius = 35;
|
||||
CornerRadius = 10;
|
||||
CornerExponent = 2.5f;
|
||||
Action = this.ShowPopover;
|
||||
|
||||
Children = new Drawable[]
|
||||
|
||||
@@ -26,18 +26,6 @@ namespace osu.Game.Graphics.UserInterfaceV2
|
||||
|
||||
private Color4? triangleGradientSecondColour;
|
||||
|
||||
public override float Height
|
||||
{
|
||||
get => base.Height;
|
||||
set
|
||||
{
|
||||
base.Height = value;
|
||||
|
||||
if (IsLoaded)
|
||||
updateCornerRadius();
|
||||
}
|
||||
}
|
||||
|
||||
public override Color4 BackgroundColour
|
||||
{
|
||||
get => base.BackgroundColour;
|
||||
@@ -61,7 +49,10 @@ namespace osu.Game.Graphics.UserInterfaceV2
|
||||
{
|
||||
base.LoadComplete();
|
||||
|
||||
updateCornerRadius();
|
||||
// This doesn't match the latest design spec (should be 5) but is an in-between that feels right to the eye
|
||||
// until we move everything over to Form controls.
|
||||
Content.CornerRadius = 10;
|
||||
Content.CornerExponent = 2.5f;
|
||||
|
||||
Add(Triangles = new TrianglesV2
|
||||
{
|
||||
@@ -98,8 +89,6 @@ namespace osu.Game.Graphics.UserInterfaceV2
|
||||
base.OnHoverLost(e);
|
||||
}
|
||||
|
||||
private void updateCornerRadius() => Content.CornerRadius = DrawHeight / 2;
|
||||
|
||||
public virtual IEnumerable<LocalisableString> FilterTerms => new[] { Text };
|
||||
|
||||
public bool MatchingFilter
|
||||
|
||||
Reference in New Issue
Block a user