diff --git a/correct_volume_change_with_mousewheel.diff b/correct_volume_change_with_mousewheel.diff new file mode 100644 index 0000000..dd07e45 --- /dev/null +++ b/correct_volume_change_with_mousewheel.diff @@ -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) diff --git a/kmix.changes b/kmix.changes index cb76916..8ed8856 100644 --- a/kmix.changes +++ b/kmix.changes @@ -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 diff --git a/kmix.spec b/kmix.spec index d487d70..dbdd280 100644 --- a/kmix.spec +++ b/kmix.spec @@ -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