Accepting request 156376 from KDE:Distro:Factory

Added patch to correct the volume step used when changing volume with mousewheel.

OBS-URL: https://build.opensuse.org/request/show/156376
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kmix?expand=0&rev=9
This commit is contained in:
Stephan Kulow 2013-02-26 14:15:41 +00:00 committed by Git OBS Bridge
parent 44eabf8894
commit c8fb0def98
3 changed files with 33 additions and 0 deletions

View File

@ -0,0 +1,23 @@
diff --git a/gui/kmixdockwidget.cpp b/gui/kmixdockwidget.cpp
index 3bda22e..fee74d9 100644
--- a/gui/kmixdockwidget.cpp
+++ b/gui/kmixdockwidget.cpp
@@ -347,10 +347,16 @@ KMixDockWidget::trayWheelEvent(int delta,Qt::Orientation wheelOrientation)
if ( inc < 1 ) inc = 1;
+ if (delta < 0)
+ inc = -inc;
+
if (wheelOrientation == Qt::Horizontal) // Reverse horizontal scroll: bko228780
- delta = -delta;
+ inc = -inc;
- long int cv = inc * (delta / 120 );
+ // bko313579 Do not use "delta", as that is setting more related to documents (Editor, Browser). KMix should
+ // simply always use its own VOLUME_STEP_DIVISOR as a base for percentage change.
+ //long int cv = inc * (delta / 120 );
+ long cv = inc;
bool isInactive = vol.isCapture() ? !md->isRecSource() : md->isMuted();
kDebug() << "Operating on capture=" << vol.isCapture() << ", isInactive=" << isInactive;
if ( cv > 0 && isInactive)

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Feb 25 22:24:50 UTC 2013 - tittiatcoke@gmail.com
- Added patch correct_volume_change_with_mousewheel.diff to
correct the volume change step when used with mousewheel
(bko#313579)
-------------------------------------------------------------------
Thu Jan 31 17:55:09 UTC 2013 - tittiatcoke@gmail.com

View File

@ -30,6 +30,8 @@ Url: http://www.kde.org
Version: 4.10.0
Release: 0
Source0: %{name}-%{version}.tar.xz
#PATCH-FIX-UPSTREAM correct_volume_change_with_mousewheel.diff tittiatcoke@gmail.com -- Correct the volume change step when done with mousewheel
Patch1: correct_volume_change_with_mousewheel.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%kde4_runtime_requires
@ -38,6 +40,7 @@ KDE's full featured mini mixer
%prep
%setup -q
%patch1 -p1
%build
%cmake_kde4 -d build