h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-06-07 02:53:38 +08:00
Code Issues Releases Wiki Activity

Fix mismatching spacing in dropdown form menus

Browse Source
This commit is contained in:
Dean Herbert
2026-01-27 18:41:27 +09:00
Unverified
parent 786ea35274
commit b5e93b98c9
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Graphics/UserInterfaceV2/FormControlBackground.cs
+5 -2
View File
@@ -15,6 +15,9 @@ namespace osu.Game.Graphics.UserInterfaceV2
{
public partial class FormControlBackground : CompositeDrawable
{
public const float CORNER_EXPONENT = 2.5f;
public const float BORDER_THICKNESS = 2.5f;
private bool styleDisabled;
public bool StyleDisabled
@@ -61,9 +64,9 @@ namespace osu.Game.Graphics.UserInterfaceV2
Masking = true;
CornerRadius = 5;
CornerExponent = 2.5f;
BorderThickness = 2.5f;
CornerExponent = CORNER_EXPONENT;
BorderThickness = BORDER_THICKNESS;
InternalChildren = new Drawable[]
{
osu.Game/Graphics/UserInterfaceV2/FormDropdown.cs
+8 -5
View File
@@ -156,8 +156,6 @@ namespace osu.Game.Graphics.UserInterfaceV2
Masking = true;
CornerRadius = 5;
Margin = new MarginPadding { Bottom = header_menu_spacing };
// We use our own background for more control.
Background.Alpha = 0;
@@ -290,7 +288,8 @@ namespace osu.Game.Graphics.UserInterfaceV2
{
ItemsContainer.Padding = new MarginPadding(9);
MaskingContainer.BorderThickness = 2;
MaskingContainer.BorderThickness = FormControlBackground.BORDER_THICKNESS;
MaskingContainer.CornerExponent = FormControlBackground.CORNER_EXPONENT;
MaskingContainer.BorderColour = colourProvider.Highlight1;
}
@@ -301,13 +300,17 @@ namespace osu.Game.Graphics.UserInterfaceV2
// there's negative bottom margin applied on the whole dropdown control to remove extra spacing when the menu is closed.
// however, when the menu is open, we want spacing between the menu and the next control below it. therefore apply bottom margin here.
// we use a transform to keep the open animation smooth while margin is adjusted.
this.TransformTo(nameof(Margin), new MarginPadding { Bottom = header_menu_spacing }, 300, Easing.OutQuint);
this.TransformTo(nameof(Margin), new MarginPadding
{
Top = header_menu_spacing,
Bottom = header_menu_spacing
}, 50, Easing.OutQuint);
}
protected override void AnimateClose()
{
base.AnimateClose();
this.TransformTo(nameof(Margin), new MarginPadding { Bottom = 0 }, 300, Easing.OutQuint);
this.TransformTo(nameof(Margin), new MarginPadding { Bottom = 0 }, 300);
}
}
}