sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-08-04 23:24:04 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into osu-fontusage

Browse Source
This commit is contained in:
Dean Herbert
2019-02-22 18:09:23 +09:00
committed by GitHub
parent 8853f7ad76 3f9a7b8873
commit 3015d40f8f
286 changed files with 837 additions and 876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
osu.Game/Overlays/Volume/MuteButton.cs
View File

@ -3,7 +3,7 @@
using System;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Colour;
@ -69,10 +69,10 @@ namespace osu.Game.Overlays.Volume
}
});
Current.ValueChanged += newValue =>
Current.ValueChanged += muted =>
{
icon.Icon = newValue ? FontAwesome.fa_volume_off : FontAwesome.fa_volume_up;
icon.Margin = new MarginPadding { Left = newValue ? width / 2 - 15 : width / 2 - 10 }; //Magic numbers to line up both icons because they're different widths
icon.Icon = muted.NewValue ? FontAwesome.fa_volume_off : FontAwesome.fa_volume_up;
icon.Margin = new MarginPadding { Left = muted.NewValue ? width / 2 - 15 : width / 2 - 10 }; //Magic numbers to line up both icons because they're different widths
};
Current.TriggerChange();
}

8
osu.Game/Overlays/Volume/VolumeMeter.cs
View File

@ -4,7 +4,7 @@
using System;
using System.Globalization;
using osu.Framework.Allocation;
using osu.Framework.Configuration;
using osu.Framework.Bindables;
using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
@ -174,10 +174,10 @@ namespace osu.Game.Overlays.Volume
}
}
};
Bindable.ValueChanged += newVolume =>
Bindable.ValueChanged += volume =>
{
this.TransformTo("DisplayVolume",
newVolume,
volume.NewValue,
400,
Easing.OutQuint);
};
@ -217,7 +217,7 @@ namespace osu.Game.Overlays.Volume
public double Volume
{
get => Bindable;
get => Bindable.Value;
private set => Bindable.Value = value;
}