Merge lp://staging/~jeremywootten/pantheon-files/fix-drop-onto-pathbar-2 into lp://staging/~elementary-apps/pantheon-files/trunk
| Status: | Merged |
|---|---|
| Approved by: | Cody Garver |
| Approved revision: | 1815 |
| Merged at revision: | 1825 |
| Proposed branch: | lp://staging/~jeremywootten/pantheon-files/fix-drop-onto-pathbar-2 |
| Merge into: | lp://staging/~elementary-apps/pantheon-files/trunk |
| Diff against target: |
81 lines (+20/-10) 2 files modified
libwidgets/LocationBar.vala (+1/-2) src/View/LocationBar.vala (+19/-8) |
| To merge this branch: | bzr merge lp://staging/~jeremywootten/pantheon-files/fix-drop-onto-pathbar-2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| elementary Apps team | Pending | ||
|
Review via email:
|
|||
Commit message
Pathbar drag destination matches view (lp:1363357)
Description of the change
This branch fixes dropping onto the pathbar. The drag action indicator how shows the appropriate action depending the button and control key used. The behaviour is generally the same as dragging between views (and has the same limitations) except that hovering over a breadcrumb does not auto-open that folder.
TESTS (with read/write permissions in source and destination)
1) Normal drag a file to a breadcrumb (not the parent). Indicator shows MOVE. On drop file is moved. Ctrl-Z undoes the action.
2) Ctrl-drag a file to a breadcrumb (not the parent). Indicator shows COPY. On drop file is copied. Ctrl-Z undoes the action.
3) Right-button-drag a file to a breadcrumb (not the parent). Indicator shows ASK. On drop context menu showing MOVE, COPY, LINK and CANCEL options. Ctrl-Z undoes the action.
