From 166a78a15a739f6ec2e24c2bac93707951d55073 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sat, 8 Apr 2017 11:01:41 +0200 Subject: [PATCH 1/5] Fix up comment in audio device options --- .../Overlays/Options/Sections/Audio/AudioDevicesOptions.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs index df9be143c3..e3033b876d 100644 --- a/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs +++ b/osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs @@ -43,8 +43,8 @@ namespace osu.Game.Overlays.Options.Sections.Audio // device names. Dropdowns, however, may not have multiple identical // keys. Thus, we remove duplicate audio device names from // the dropdown. BASS does not give us a simple mechanism to select - // specific audio devices in such a case anyways.This functionality would - // require OS-specific and involved code. + // specific audio devices in such a case anyways. Such + // functionality would require involved OS-specific code. dropdown.Items = deviceItems.Distinct().ToList(); } From b99cbe69624f26976fe25f188dc26894bd0a4725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Sat, 8 Apr 2017 11:01:56 +0200 Subject: [PATCH 2/5] Add back nice scaling of music controller buttons --- osu-framework | 2 +- osu.Game/Overlays/MusicController.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/osu-framework b/osu-framework index a7c99e06ff..45e75163b2 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit a7c99e06ff4c3f56fad24bec170eb93f42b1e149 +Subproject commit 45e75163b272b7aa023afec7801ea079aba4ee69 diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index 1a955edbe0..997c8cd82f 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/osu.Game/Overlays/MusicController.cs @@ -144,7 +144,7 @@ namespace osu.Game.Overlays }, playButton = new Button { - //Scale = new Vector2(1.3f), + Scale = new Vector2(1.3f), Action = () => { if (current?.Track == null) return; @@ -484,7 +484,7 @@ namespace osu.Game.Overlays protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) { - content.ScaleTo(1, 2000, EasingTypes.OutQuint); + content.ScaleTo(0.75f, 2000, EasingTypes.OutQuint); return base.OnMouseDown(state, args); } From e40ad69a3b4a2759743a4c47a013ca1d894f000b Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 8 Apr 2017 19:25:40 +0900 Subject: [PATCH 3/5] Adjust icon scale of play button. --- osu.Game/Overlays/MusicController.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index 997c8cd82f..627c3ea18c 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/osu.Game/Overlays/MusicController.cs @@ -48,7 +48,7 @@ namespace osu.Game.Overlays private const float progress_height = 10; - private const float bottom_black_area_height = 50; + private const float bottom_black_area_height = 55; public MusicController() { @@ -144,7 +144,8 @@ namespace osu.Game.Overlays }, playButton = new Button { - Scale = new Vector2(1.3f), + Scale = new Vector2(1.4f), + IconScale = new Vector2(1.4f), Action = () => { if (current?.Track == null) return; @@ -423,6 +424,12 @@ namespace osu.Game.Overlays private const float button_size = 30; + public Vector2 IconScale + { + get { return icon.Scale; } + set { icon.Scale = value; } + } + public Button() { AutoSizeAxes = Axes.Both; From e1e9772d46cad3d185c3fff3b8ed38182d4966de Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 8 Apr 2017 19:28:29 +0900 Subject: [PATCH 4/5] Flash buttons on click. --- osu.Game/Overlays/MusicController.cs | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/osu.Game/Overlays/MusicController.cs b/osu.Game/Overlays/MusicController.cs index 627c3ea18c..9d21a0341c 100644 --- a/osu.Game/Overlays/MusicController.cs +++ b/osu.Game/Overlays/MusicController.cs @@ -423,6 +423,7 @@ namespace osu.Game.Overlays } private const float button_size = 30; + private Color4 flashColour; public Vector2 IconScale { @@ -475,6 +476,7 @@ namespace osu.Game.Overlays private void load(OsuColour colours) { hover.Colour = colours.Yellow.Opacity(0.6f); + flashColour = colours.Yellow; } protected override bool OnHover(InputState state) @@ -489,6 +491,12 @@ namespace osu.Game.Overlays base.OnHoverLost(state); } + protected override bool OnClick(InputState state) + { + hover.FlashColour(flashColour, 800, EasingTypes.OutQuint); + return base.OnClick(state); + } + protected override bool OnMouseDown(InputState state, MouseDownEventArgs args) { content.ScaleTo(0.75f, 2000, EasingTypes.OutQuint); From b5431c496b16aa68419d208a048554280b8fa728 Mon Sep 17 00:00:00 2001 From: Dean Herbert Date: Sat, 8 Apr 2017 19:34:04 +0900 Subject: [PATCH 5/5] Fix osu! logo handling drags for no reason. --- osu.Game/Screens/Menu/OsuLogo.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/osu.Game/Screens/Menu/OsuLogo.cs b/osu.Game/Screens/Menu/OsuLogo.cs index e5fb1db38e..29f6cb2967 100644 --- a/osu.Game/Screens/Menu/OsuLogo.cs +++ b/osu.Game/Screens/Menu/OsuLogo.cs @@ -194,8 +194,6 @@ namespace osu.Game.Screens.Menu return true; } - protected override bool OnDragStart(InputState state) => true; - protected override bool OnClick(InputState state) { if (!Interactive) return false;