Hello community,

here is the log from the commit of package dolphin for openSUSE:Factory checked 
in at 2018-10-11 11:41:31
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dolphin (Old)
 and      /work/SRC/openSUSE:Factory/.dolphin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "dolphin"

Thu Oct 11 11:41:31 2018 rev:46 rq:639823 version:18.08.1

Changes:
--------
--- /work/SRC/openSUSE:Factory/dolphin/dolphin.changes  2018-10-01 
08:13:49.430106390 +0200
+++ /work/SRC/openSUSE:Factory/.dolphin.new/dolphin.changes     2018-10-11 
11:41:35.847081176 +0200
@@ -1,0 +2,7 @@
+Wed Oct  3 21:08:35 UTC 2018 - [email protected]
+
+- Add Fix-that-dragging-a-file-can-trigger-inline-rename.patch to
+  prevent accidentally triggering inline rename by just dragging a
+  file (boo#1108797, kde#398375)
+
+-------------------------------------------------------------------

New:
----
  Fix-that-dragging-a-file-can-trigger-inline-rename.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ dolphin.spec ++++++
--- /var/tmp/diff_new_pack.axLldP/_old  2018-10-11 11:41:36.331080559 +0200
+++ /var/tmp/diff_new_pack.axLldP/_new  2018-10-11 11:41:36.331080559 +0200
@@ -35,6 +35,8 @@
 Patch1:         0001-Revert-Disallow-executing-Dolphin-as-root-on-Linux.patch
 # PATCH-FIX-UPSTREAM
 Patch2:         Dont-assign-twice-the-same-key-to-the-action-New-Tab.patch
+# PATCH-FIX-UPSTREAM
+Patch3:         Fix-that-dragging-a-file-can-trigger-inline-rename.patch
 BuildRequires:  baloo5-devel
 BuildRequires:  baloo5-widgets-devel
 BuildRequires:  extra-cmake-modules >= 1.6.0

++++++ Fix-that-dragging-a-file-can-trigger-inline-rename.patch ++++++
>From ddfc86ab8c207b81ec9ac83167d081b8d01c2750 Mon Sep 17 00:00:00 2001
From: Andreas Krutzler <[email protected]>
Date: Tue, 2 Oct 2018 20:25:57 +0200
Subject: Fix that dragging a file can trigger inline rename.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Summary:
Inline renaming is aborted as soon as an item is dragged. Previously, 
’m_dragging' was used to determine if an item was being dragged. However, 
inline renaming is triggered after a certain amount of
time, during which time the user may have stopped dragging items.

BUG: 398375
FIXED-IN: 18.08.2

Test Plan: When dragging an selected item, inline renaming should never be 
started, regardless of where you drag it (Places panel, other split-view 
window, out of the Dolphin window, ...).

Reviewers: wbauer, elvisangelaccio, #dolphin, ngraham

Reviewed By: wbauer, elvisangelaccio, #dolphin, ngraham

Subscribers: kfm-devel

Tags: #dolphin

Differential Revision: https://phabricator.kde.org/D15904
---
 src/views/dolphinview.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 342c226..1db62b8 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -755,6 +755,7 @@ bool DolphinView::eventFilter(QObject* watched, QEvent* 
event)
     case QEvent::GraphicsSceneDragEnter:
         if (watched == m_view) {
             m_dragging = true;
+            abortTwoClicksRenaming();
         }
         break;
 
@@ -1432,8 +1433,8 @@ void DolphinView::slotTwoClicksRenamingTimerTimeout()
 {
     const KItemListSelectionManager* selectionManager = 
m_container->controller()->selectionManager();
 
-    // verify that only one item is selected and that no item is dragged
-    if (selectionManager->selectedItems().count() == 1 && !m_dragging) {
+    // verify that only one item is selected
+    if (selectionManager->selectedItems().count() == 1) {
         const int index = selectionManager->currentItem();
         const QUrl fileItemUrl = m_model->fileItem(index).url();
 
-- 
cgit v0.11.2


Reply via email to