backport drop-files-onto-the-desktop fix

epel9
Rex Dieter 10 years ago
parent cb49d3dab4
commit ffee743bbb

@ -0,0 +1,41 @@
From a44392b54ca3e8fa7250537c7d7a9f4004c6af03 Mon Sep 17 00:00:00 2001
From: Kai Uwe Broulik <kde@privat.broulik.de>
Date: Wed, 10 Jun 2015 13:07:27 +0200
Subject: [PATCH 149/151] Fix dropping files onto the desktop containment
REVIEW: 124055
FIXED-IN: 5.3.2
BUG: 346867
---
containments/desktop/package/contents/ui/main.qml | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/containments/desktop/package/contents/ui/main.qml b/containments/desktop/package/contents/ui/main.qml
index 7fd7481..1df2720 100644
--- a/containments/desktop/package/contents/ui/main.qml
+++ b/containments/desktop/package/contents/ui/main.qml
@@ -180,9 +180,7 @@ DragDrop.DropArea {
folderViewLayer.view.scrollRight = (event.x > width - (units.largeSpacing * 3));
folderViewLayer.view.scrollUp = (event.y < (units.largeSpacing * 3));
folderViewLayer.view.scrollDown = (event.y > height - (units.largeSpacing * 3));
- }
-
- if (isContainment && !event.mimeData.hasUrls) {
+ } else if (isContainment) {
placeHolder.width = LayoutManager.defaultAppletSize.width;
placeHolder.height = LayoutManager.defaultAppletSize.height;
placeHolder.x = event.x - placeHolder.width / 2;
@@ -216,9 +214,7 @@ DragDrop.DropArea {
folderViewLayer.view.scrollDown = false;
folderViewLayer.view.drop(root, event, mapToItem(folderViewLayer.view, event.x, event.y));
- }
-
- if (isContainment && !event.mimeData.hasUrls) {
+ } else if (isContainment) {
placeHolderPaint.opacity = 0;
plasmoid.processMimeData(event.mimeData, event.x - placeHolder.width / 2, event.y - placeHolder.height / 2);
}
--
2.4.3

@ -1,6 +1,6 @@
Name: plasma-desktop
Version: 5.3.1
Release: 3%{?dist}
Release: 4%{?dist}
Summary: Plasma Desktop shell
License: GPLv2+ and (GPLv2 or GPLv3)
@ -23,6 +23,7 @@ Patch101: plasma-desktop-fix-fontinst-service-path.patch
Patch102: plasma-desktop-fedora_layout.patch
## upstream patches
Patch149: 0149-Fix-dropping-files-onto-the-desktop-containment.patch
BuildRequires: libusb-devel
BuildRequires: fontconfig-devel
@ -279,6 +280,9 @@ fi
%changelog
* Mon Jun 15 2015 Rex Dieter <rdieter@fedoraproject.org> 5.3.1-3.1
- backport "Fix-dropping-files-onto-the-desktop-containment"
* Mon Jun 08 2015 Rex Dieter <rdieter@fedoraproject.org> 5.3.1-3
- Requires: kmenuedit, instead of Recommends which doesn't seem to work reliably yet (#1229393)

Loading…
Cancel
Save