Merge lp:~fboucault/unity-2d/dash_drag_drop_fix into lp:unity-2d

Proposed by Florian Boucault
Status: Merged
Approved by: Alberto Mardegan
Approved revision: 678
Merged at revision: 681
Proposed branch: lp:~fboucault/unity-2d/dash_drag_drop_fix
Merge into: lp:unity-2d
Diff against target: 32 lines (+3/-1)
2 files modified
places/RendererGrid.qml (+1/-0)
places/TileVertical.qml (+2/-1)
To merge this branch: bzr merge lp:~fboucault/unity-2d/dash_drag_drop_fix
Reviewer Review Type Date Requested Status
Alberto Mardegan (community) Approve
Review via email: mp+73454@code.launchpad.net

Description of the change

[dash] Fixed drag and drop of results from the dash (in particular applications to the launcher).

To post a comment you must log in.
Revision history for this message
Alberto Mardegan (mardy) wrote :

Another excellent one, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'places/RendererGrid.qml'
2--- places/RendererGrid.qml 2011-08-16 09:35:04 +0000
3+++ places/RendererGrid.qml 2011-08-30 22:08:23 +0000
4@@ -100,6 +100,7 @@
5 item.displayName = displayName
6 item.comment = comment
7 item.focus = true
8+ item.dndUri = dndUri
9 }
10 }
11 }
12
13=== modified file 'places/TileVertical.qml'
14--- places/TileVertical.qml 2011-08-25 13:08:52 +0000
15+++ places/TileVertical.qml 2011-08-30 22:08:23 +0000
16@@ -34,6 +34,7 @@
17 property string mimetype
18 property string displayName
19 property string comment
20+ property string dndUri
21
22 Accessible.name: displayName
23
24@@ -44,7 +45,7 @@
25
26 DragItemWithUrl {
27 anchors.fill: parent
28- url: decodeURIComponent(uri)
29+ url: decodeURIComponent(dndUri)
30 defaultAction: {
31 if (!url.indexOf("application://")) return Qt.CopyAction
32 else if (!url.indexOf("unity-install://")) return Qt.IgnoreAction

Subscribers

People subscribed via source and target branches