diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2017-07-07 03:00:39 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2017-07-07 03:01:07 +0200 |
commit | 1bff22f05126a7c02007c3388669f04a3330a15e (patch) | |
tree | 93d20634f9f9e4a21b67cfebd4c53201e8fa1cd7 /libkonq | |
parent | c623f1cf8d995ea1d7be3c1b7b1132dd0cb7b812 (diff) | |
download | tdebase-1bff22f05126a7c02007c3388669f04a3330a15e.tar.gz tdebase-1bff22f05126a7c02007c3388669f04a3330a15e.zip |
Konqueror: Do not include items that are selected but hidden by the filter
for operations such as copying, moving, deleting,...
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit e69e2fb93014948e7734e4828330455b2a15fe7d)
Diffstat (limited to 'libkonq')
-rw-r--r-- | libkonq/konq_iconviewwidget.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc index 96e04df29..b51c8502d 100644 --- a/libkonq/konq_iconviewwidget.cc +++ b/libkonq/konq_iconviewwidget.cc @@ -902,7 +902,7 @@ KFileItemList KonqIconViewWidget::selectedFileItems() TQIconViewItem *it = firstItem(); for (; it; it = it->nextItem() ) - if ( it->isSelected() ) { + if ( it->isVisible() && it->isSelected() ) { KFileItem *fItem = (static_cast<KFileIVI *>(it))->item(); lstItems.append( fItem ); } @@ -969,7 +969,7 @@ KonqIconDrag * KonqIconViewWidget::konqDragObject( TQWidget * dragSource ) TQIconViewItem *primaryItem = currentItem(); // Append all items to the drag object for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) { - if ( it->isSelected() ) { + if ( it->isVisible() && it->isSelected() ) { if (!primaryItem) primaryItem = it; KFileItem* fileItem = (static_cast<KFileIVI *>(it))->item(); @@ -1094,7 +1094,7 @@ void KonqIconViewWidget::slotSelectionChanged() for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) { - if ( it->isSelected() ) + if ( it->isVisible() && it->isSelected() ) { iCount++; canCopy++; @@ -1136,7 +1136,7 @@ void KonqIconViewWidget::renameSelectedItem() TQIconViewItem * item = 0L; TQIconViewItem *it = firstItem(); for (; it; it = it->nextItem() ) - if ( it->isSelected() && !item ) + if ( it->isVisible() && it->isSelected() && !item ) { item = it; break; @@ -1184,7 +1184,7 @@ KURL::List KonqIconViewWidget::selectedUrls( UrlFlags flags ) const KURL::List lstURLs; bool dummy; for ( TQIconViewItem *it = firstItem(); it; it = it->nextItem() ) - if ( it->isSelected() ) { + if ( it->isVisible() && it->isSelected() ) { KFileItem* item = (static_cast<KFileIVI *>( it ))->item(); lstURLs.append( flags == MostLocalUrls ? item->mostLocalURL( dummy ) : item->url() ); } |