Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjust slider bar implementations to show focused state #30413

Merged
merged 5 commits into from
Oct 25, 2024
Merged

Adjust slider bar implementations to show focused state #30413

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6dd1efa
Adjust slider bar implementations to show focused state
peppy Oct 24, 2024
6e8400a
Fix gap in `ShearedSliderBar` when focused
peppy Oct 24, 2024
c666fa7
Update framework
peppy Oct 25, 2024
1fc221b
Fix focus glow appearing above range slider's nubs
peppy Oct 25, 2024
e96d593
Fix redundant array type specification
bdach Oct 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix focus glow appearing above range slider's nubs
  • Loading branch information
@peppy
peppy committed Oct 25, 2024
commit 1fc221bb396c0c0fa626c49cc80e154654ea73e4
6 changes: 5 additions & 1 deletion osu.Game/Graphics/UserInterface/RangeSlider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@
{
const float vertical_offset = 13;

InternalChildren = new Drawable[]

Check failure on line 101 in osu.Game/Graphics/UserInterface/RangeSlider.cs

View workflow job for this annotation

GitHub Actions / Code Quality 

Redundant explicit array type specification in osu.Game\Graphics\UserInterface\RangeSlider.cs on line 101
{
label = new OsuSpriteText
{
Expand All @@ -115,7 +115,9 @@
KeyboardStep = 0.1f,
RelativeSizeAxes = Axes.X,
Y = vertical_offset,
}
},
upperBound.Nub.CreateProxy(),
lowerBound.Nub.CreateProxy(),
};
}

Expand Down Expand Up @@ -160,6 +162,8 @@

protected partial class BoundSlider : RoundedSliderBar<double>
{
public new Nub Nub => base.Nub;

public string? DefaultString;
public LocalisableString? DefaultTooltip;
public string? TooltipSuffix;
Expand Down
Loading