Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:13.1 checked in at 2013-09-29 17:48:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1/kdebase4-workspace (Old) and /work/SRC/openSUSE:13.1/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace" Changes: -------- --- /work/SRC/openSUSE:13.1/kdebase4-workspace/kdebase4-workspace.changes 2013-09-23 10:55:34.000000000 +0200 +++ /work/SRC/openSUSE:13.1/.kdebase4-workspace.new/kdebase4-workspace.changes 2013-09-29 17:48:39.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Sep 26 09:24:04 UTC 2013 - [email protected] + +- Added changeset_re1a590badee13b862c5393f45ea59ecad9: Don't propagate + drops to the containment while animating (kde#324391) + +------------------------------------------------------------------- New: ---- changeset_re1a590badee13b862c5393f45ea59ecad98a7267.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.ZLlkES/_old 2013-09-29 17:48:39.000000000 +0200 +++ /var/tmp/diff_new_pack.ZLlkES/_new 2013-09-29 17:48:39.000000000 +0200 @@ -147,6 +147,8 @@ Patch66: add-calculator-hotkey.patch # PATCH-FIX-OPENSUSE kscreensaver-disable-sessionmanagement.diff -- disables session mangement for screensavers (kde#314859, bnc#809835) Patch67: kscreensaver-disable-sessionmanagement.diff +# PATCH-FIX-UPSTREAM changeset_re1a590badee13b862c5393f45ea59ecad98a7267.diff Don't propagate drops to the containment while animating kde#324391 +Patch68: changeset_re1a590badee13b862c5393f45ea59ecad98a7267.diff # PATCH-FIX-OPENSUSE helper_actions_syspath.patch -- disables org.kde.powerdevil.backlighthelper.syspath policy, until bnc#825256 gets resolved Patch1000: helper_actions_syspath.patch # NOTE -- Following two krunner patches are from kde-workspace master branch! @@ -375,6 +377,7 @@ %patch65 -p1 %patch66 -p1 %patch67 -p0 +%patch68 -p1 %if 0%{?suse_version} <= 1230 %patch1000 -p1 %endif ++++++ changeset_re1a590badee13b862c5393f45ea59ecad98a7267.diff ++++++ commit e1a590badee13b862c5393f45ea59ecad98a7267 Author: Eike Hein <[email protected]> Date: Mon Sep 2 20:08:08 2013 +0200 Don't propagate drops to the containment while animating. Plus a little cleanup in the drag move and leave code ... BUG:324391 diff --git a/plasma/desktop/applets/tasks/package/contents/ui/MouseHandler.qml b/plasma/desktop/applets/tasks/package/contents/ui/MouseHandler.qml index c2a5cdf..648e3b9 100644 --- a/plasma/desktop/applets/tasks/package/contents/ui/MouseHandler.qml +++ b/plasma/desktop/applets/tasks/package/contents/ui/MouseHandler.qml @@ -35,29 +35,30 @@ Item { property variant hoveredItem - enabled: !target.animating - onDragMove: { - var above = target.childAt(event.x, event.y); + if (target.animating) { + return; + } - if (tasks.dragSource) { - if (above != tasks.dragSource - && !(tasks.dragSource.isLauncher || above.isLauncher)) { - var targetIndex = TaskTools.insertionIndexAt(event.x, event.y); + var above = target.childAt(event.x, event.y); - itemMove(tasks.dragSource.itemId, targetIndex); + if (above) { + if (tasks.dragSource) { + if (tasks.dragSource != above && !tasks.dragSource.isLauncher && !above.isLauncher) { + itemMove(tasks.dragSource.itemId, TaskTools.insertionIndexAt(event.x, event.y)); + } + } else if (hoveredItem != above) { + hoveredItem = above; + activationTimer.start(); } - } else if (above && hoveredItem != above) { - hoveredItem = above; - activationTimer.start(); - } else if (!above) { + } else { hoveredItem = 0; activationTimer.stop(); } } onDragLeave: { - dragItem = 0; + hoveredItem = 0; activationTimer.stop(); } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
