From 909e763ed304a6f7c05d8d2355c5f4b4a38ee692 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Wed, 29 Feb 2012 19:10:21 +0100 Subject: [PATCH] if scrolling with mouse wheel: show cursor and handle that --- Vocaluxe/Menu/CGraphics.cs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Vocaluxe/Menu/CGraphics.cs b/Vocaluxe/Menu/CGraphics.cs index 8fbd652c..f96e5add 100644 --- a/Vocaluxe/Menu/CGraphics.cs +++ b/Vocaluxe/Menu/CGraphics.cs @@ -100,7 +100,7 @@ namespace Vocaluxe.Menu if (t < _CursorFadingTime) { if (_CursorTargetAlpha >= _CursorStartAlpha) - _Cursor.color.A = (_CursorTargetAlpha - _CursorStartAlpha) * t / _CursorFadingTime; + _Cursor.color.A = _CursorStartAlpha + (_CursorTargetAlpha - _CursorStartAlpha) * t / _CursorFadingTime; else _Cursor.color.A = (_CursorStartAlpha - _CursorTargetAlpha) * (1f - t / _CursorFadingTime); } @@ -150,6 +150,13 @@ namespace Vocaluxe.Menu Fade(0f, 0.5f); } + public void FadeIn() + { + _Movetimer.Reset(); + _Movetimer.Start(); + Fade(1f, 0.2f); + } + private void Fade(float targetAlpha, float time) { _CursorFadingTimer.Stop(); @@ -418,6 +425,12 @@ namespace Vocaluxe.Menu while (Mouse.PollEvent(ref MouseEvent)) { + if (MouseEvent.Wheel != 0) + { + CSettings.MouseActive(); + _Cursor.FadeIn(); + } + UpdateMousePosition(MouseEvent.X, MouseEvent.Y); if (!_Fading && (_Cursor.IsActive || MouseEvent.LB || MouseEvent.RB))