Hello community,
here is the log from the commit of package kmix for openSUSE:Factory checked in
at 2013-02-26 15:15:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kmix (Old)
and /work/SRC/openSUSE:Factory/.kmix.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmix", Maintainer is "kde-maintain...@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kmix/kmix.changes 2013-02-04
20:40:13.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kmix.new/kmix.changes 2013-02-26
15:15:43.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Feb 25 22:24:50 UTC 2013 - tittiatc...@gmail.com
+
+- Added patch correct_volume_change_with_mousewheel.diff to
+ correct the volume change step when used with mousewheel
+ (bko#313579)
+
+-------------------------------------------------------------------
New:
----
correct_volume_change_with_mousewheel.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kmix.spec ++++++
--- /var/tmp/diff_new_pack.BJZewA/_old 2013-02-26 15:15:44.000000000 +0100
+++ /var/tmp/diff_new_pack.BJZewA/_new 2013-02-26 15:15:44.000000000 +0100
@@ -30,6 +30,8 @@
Version: 4.10.0
Release: 0
Source0: %{name}-%{version}.tar.xz
+#PATCH-FIX-UPSTREAM correct_volume_change_with_mousewheel.diff
tittiatc...@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 @@
%prep
%setup -q
+%patch1 -p1
%build
%cmake_kde4 -d build
++++++ correct_volume_change_with_mousewheel.diff ++++++
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)
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
