diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-05-05 01:31:49 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-05-05 05:09:57 +0200 |
| commit | 770eda3afd42b8c3c9ce2775cd6d4a4ef39a6750 (patch) | |
| tree | aa8850fec073655787260027c771db74b5e40c89 | |
| parent | 20180a433681e96f62b7fae29800b0cdd560e775 (diff) | |
| download | tdebase-770eda3afd42b8c3c9ce2775cd6d4a4ef39a6750.tar.gz tdebase-770eda3afd42b8c3c9ce2775cd6d4a4ef39a6750.zip | |
Fix konqueror drag and drop within the same window
This resolves Bug 1451
(cherry picked from commit 8bdb01112167d8d83b75353064c3c94a1a1c27a8)
| -rw-r--r-- | libkonq/konq_iconviewwidget.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc index 8db0483bb..0fe038f01 100644 --- a/libkonq/konq_iconviewwidget.cc +++ b/libkonq/konq_iconviewwidget.cc @@ -1237,6 +1237,7 @@ void KonqIconViewWidget::contentsMouseMoveEvent( TQMouseEvent *e ) void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev ) { TQIconViewItem *i = findItem( ev->pos() ); + KURL::List uriList; if ( ev->source() != viewport() && !i && m_rootItem && !m_rootItem->isWritable() ) { @@ -1247,7 +1248,9 @@ void KonqIconViewWidget::contentsDropEvent( TQDropEvent * ev ) // Short-circuit TQIconView if Ctrl is pressed, so that it's possible // to drop a file into its own parent widget to copy it. if ( !i && (ev->action() == TQDropEvent::Copy || ev->action() == TQDropEvent::Link) - && ev->source() && ev->source() == viewport()) + && ev->source() && ev->source() == viewport() + && KURLDrag::decode(ev, uriList) && !uriList.isEmpty() + && uriList.first().upURL().url(1) == url().url(1)) { // First we need to call TQIconView though, to clear the drag shape bool bMovable = itemsMovable(); |