h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-22 16:32:55 +08:00
Code Issues Releases Wiki Activity

Merge pull request #10088 from peppy/dropdown-standardise-corner-radius

Browse Source 
Round the corners of dropdowns when expanded
This commit is contained in:
Dan Balasescu 2020-09-08 19:47:00 +09:00 committed by GitHub
commit 30aefd3d7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Graphics/UserInterface/OsuDropdown.cs
View File

@ -17,6 +17,8 @@ namespace osu.Game.Graphics.UserInterface
{ {
public class OsuDropdown<T> : Dropdown<T>, IHasAccentColour public class OsuDropdown<T> : Dropdown<T>, IHasAccentColour
{ {
private const float corner_radius = 4;
private Color4 accentColour; private Color4 accentColour;
public Color4 AccentColour public Color4 AccentColour
@ -57,9 +59,11 @@ namespace osu.Game.Graphics.UserInterface
// todo: this uses the same styling as OsuMenu. hopefully we can just use OsuMenu in the future with some refactoring // todo: this uses the same styling as OsuMenu. hopefully we can just use OsuMenu in the future with some refactoring
public OsuDropdownMenu() public OsuDropdownMenu()
{ {
CornerRadius = 4; CornerRadius = corner_radius;
BackgroundColour = Color4.Black.Opacity(0.5f); BackgroundColour = Color4.Black.Opacity(0.5f);
MaskingContainer.CornerRadius = corner_radius;
// todo: this uses the same styling as OsuMenu. hopefully we can just use OsuMenu in the future with some refactoring // todo: this uses the same styling as OsuMenu. hopefully we can just use OsuMenu in the future with some refactoring
ItemsContainer.Padding = new MarginPadding(5); ItemsContainer.Padding = new MarginPadding(5);
} }
@ -138,7 +142,7 @@ namespace osu.Game.Graphics.UserInterface
Foreground.Padding = new MarginPadding(2); Foreground.Padding = new MarginPadding(2);
Masking = true; Masking = true;
CornerRadius = 6; CornerRadius = corner_radius;
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
@ -237,7 +241,7 @@ namespace osu.Game.Graphics.UserInterface
AutoSizeAxes = Axes.None; AutoSizeAxes = Axes.None;
Margin = new MarginPadding { Bottom = 4 }; Margin = new MarginPadding { Bottom = 4 };
CornerRadius = 4; CornerRadius = corner_radius;
Height = 40; Height = 40;
Foreground.Children = new Drawable[] Foreground.Children = new Drawable[]