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

Jump to bottom

Allow adjusting volume controls via a drag #26564

Merged
merged 5 commits into from Jan 17, 2024
Merged

Allow adjusting volume controls via a drag #26564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cdc6621
Allow adjusting volume controls via a drag
peppy Jan 16, 2024
9cde04c
Change drag adjustments to be linear (and account for partial deltas)
peppy Jan 17, 2024
a34d2a3
Add small volume meter to test feel
frenzibyte Jan 17, 2024
1790a5d
Remove redundant value to appease CI
frenzibyte Jan 17, 2024
23e5167
Merge branch 'master' into drag-volume-controls
frenzibyte Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion osu.Game.Tests/Visual/UserInterface/TestSceneVolumePieces.cs
View file
Open in desktop
Expand Up @@ -14,14 +14,23 @@ protected override void LoadComplete()
{
VolumeMeter meter;
MuteButton mute;
Add(meter = new VolumeMeter("MASTER", 125, Color4.Blue) { Position = new Vector2(10) });
Add(meter = new VolumeMeter("MASTER", 125, Color4.Green) { Position = new Vector2(10) });
AddSliderStep("master volume", 0, 10, 0, i => meter.Bindable.Value = i * 0.1);

Add(new VolumeMeter("BIG", 250, Color4.Red)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Position = new Vector2(10),
Margin = new MarginPadding { Left = 250 },
});

Add(new VolumeMeter("SML", 125, Color4.Blue)
{
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Position = new Vector2(10),
Margin = new MarginPadding { Right = 500 },
});

Add(mute = new MuteButton
Expand Down
27 changes: 27 additions & 0 deletions osu.Game/Overlays/Volume/VolumeMeter.cs
View file
Open in desktop
Expand Up @@ -313,6 +313,33 @@ public double Volume

private void resetAcceleration() => accelerationModifier = 1;

private float dragDelta;

protected override bool OnDragStart(DragStartEvent e)
{
dragDelta = 0;
adjustFromDrag(e.Delta);
return true;
}

protected override void OnDrag(DragEvent e)
{
adjustFromDrag(e.Delta);
base.OnDrag(e);
}

private void adjustFromDrag(Vector2 delta)
{
const float mouse_drag_divisor = 200;

dragDelta += delta.Y / mouse_drag_divisor;

if (Math.Abs(dragDelta) < 0.01) return;

Volume -= dragDelta;
dragDelta = 0;
}

private void adjust(double delta, bool isPrecise)
{
if (delta == 0)
Expand Down