sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-22 14:07:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into beatmap-details-rewrite

Browse Source
This commit is contained in:
Dean Herbert 2017-09-11 10:18:34 +09:00 committed by GitHub
commit cb24b5c436
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 4e7ea6af4f59f21f6afc522fb063c05417e1a5fe Subproject commit a617245a4261d7d6e138c2fddbbeaa7940d24ca7

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

@ -96,7 +96,7 @@ namespace osu.Game.Graphics.UserInterface
protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item) => new DrawableOsuDropdownMenuItem(item) { AccentColour = accentColour }; protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item) => new DrawableOsuDropdownMenuItem(item) { AccentColour = accentColour };
#region DrawableOsuDropdownMenuItem #region DrawableOsuDropdownMenuItem
protected class DrawableOsuDropdownMenuItem : DrawableDropdownMenuItem, IHasAccentColour public class DrawableOsuDropdownMenuItem : DrawableDropdownMenuItem, IHasAccentColour
{ {
private Color4? accentColour; private Color4? accentColour;
public Color4 AccentColour public Color4 AccentColour

12
osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs
View File

@ -15,11 +15,7 @@ namespace osu.Game.Graphics.UserInterface.Volume
{ {
private readonly VolumeMeter volumeMeterMaster; private readonly VolumeMeter volumeMeterMaster;
private void volumeChanged(double newVolume) protected override bool BlockPassThroughMouse => false;
{
Show();
schedulePopOut();
}
public VolumeControl() public VolumeControl()
{ {
@ -85,6 +81,12 @@ namespace osu.Game.Graphics.UserInterface.Volume
return false; return false;
} }
private void volumeChanged(double newVolume)
{
Show();
schedulePopOut();
}
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(AudioManager audio) private void load(AudioManager audio)
{ {