From 69ff4bfa46cc51aab72dd6e17260c376fb0704c6 Mon Sep 17 00:00:00 2001 From: naoey Date: Wed, 6 Sep 2017 20:04:21 +0530 Subject: [PATCH 1/3] Fix startup crash on mono. --- osu.Game/Graphics/UserInterface/OsuDropdown.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu.Game/Graphics/UserInterface/OsuDropdown.cs b/osu.Game/Graphics/UserInterface/OsuDropdown.cs index b69186e8b0..f605804aaa 100644 --- a/osu.Game/Graphics/UserInterface/OsuDropdown.cs +++ b/osu.Game/Graphics/UserInterface/OsuDropdown.cs @@ -96,7 +96,7 @@ namespace osu.Game.Graphics.UserInterface protected override DrawableMenuItem CreateDrawableMenuItem(MenuItem item) => new DrawableOsuDropdownMenuItem(item) { AccentColour = accentColour }; #region DrawableOsuDropdownMenuItem - protected class DrawableOsuDropdownMenuItem : DrawableDropdownMenuItem, IHasAccentColour + public class DrawableOsuDropdownMenuItem : DrawableDropdownMenuItem, IHasAccentColour { private Color4? accentColour; public Color4 AccentColour From 0a9ca8a1ff89c58f39b171256239be41640ea3e0 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sun, 10 Sep 2017 11:53:47 +0900 Subject: [PATCH 2/3] Update framework --- osu-framework | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/osu-framework b/osu-framework index 4e7ea6af4f..a617245a42 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 4e7ea6af4f59f21f6afc522fb063c05417e1a5fe +Subproject commit a617245a4261d7d6e138c2fddbbeaa7940d24ca7 From f33bd700c5ae1f1ecd602b8a1dfe1f15c7739129 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Mon, 11 Sep 2017 08:27:29 +0900 Subject: [PATCH 3/3] Fix individual volume controls not being adjustable via wheel They were blocking each others' input unnecessarily. --- .../Graphics/UserInterface/Volume/VolumeControl.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs index 4c108e793a..8c777f491b 100644 --- a/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs +++ b/osu.Game/Graphics/UserInterface/Volume/VolumeControl.cs @@ -15,11 +15,7 @@ namespace osu.Game.Graphics.UserInterface.Volume { private readonly VolumeMeter volumeMeterMaster; - private void volumeChanged(double newVolume) - { - Show(); - schedulePopOut(); - } + protected override bool BlockPassThroughMouse => false; public VolumeControl() { @@ -85,6 +81,12 @@ namespace osu.Game.Graphics.UserInterface.Volume return false; } + private void volumeChanged(double newVolume) + { + Show(); + schedulePopOut(); + } + [BackgroundDependencyLoader] private void load(AudioManager audio) {