summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-07-07 00:41:34 (GMT)
committer Slávek Banko <slavek.banko@axis.cz>2017-07-07 00:41:34 (GMT)
commit924d9936719a780488cdafecd77346c84a620c79 (patch)
treea07591b1ea52d544ebb9e40639805598461955bc
parent50d21388fb27b915d32b406fac9e587b632413e8 (diff)
downloadtdebase-924d9936.zip
tdebase-924d9936.tar.gz
Konqueror: Deselect items that are hidden by the filter during Select and Deselect
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--konqueror/iconview/konq_iconview.cc26
-rw-r--r--konqueror/listview/konq_listview.cc28
2 files changed, 38 insertions, 16 deletions
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cc
index 595c029..5efc1e7 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cc
@@ -557,10 +557,15 @@ void KonqKfmIconView::slotSelect()
m_pIconView->blockSignals( true );
TQIconViewItem *it = m_pIconView->firstItem();
- while ( it )
- {
- if ( re.exactMatch( it->text() ) )
- it->setSelected( true, true );
+ while ( it ) {
+ if ( it->isVisible() ) {
+ if ( re.exactMatch( it->text() ) ) {
+ it->setSelected( true, true );
+ }
+ }
+ else {
+ it->setSelected( false, true );
+ }
it = it->nextItem();
}
@@ -584,10 +589,15 @@ void KonqKfmIconView::slotUnselect()
m_pIconView->blockSignals( true );
TQIconViewItem *it = m_pIconView->firstItem();
- while ( it )
- {
- if ( re.exactMatch( it->text() ) )
- it->setSelected( false, true );
+ while ( it ) {
+ if ( it->isVisible() ) {
+ if ( re.exactMatch( it->text() ) ) {
+ it->setSelected( false, true );
+ }
+ }
+ else {
+ it->setSelected( false, true );
+ }
it = it->nextItem();
}
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cc
index 8c9369a..67da49c 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cc
@@ -389,17 +389,22 @@ void KonqListView::slotSelect()
for (KonqBaseListViewWidget::iterator it = m_pListView->begin(); it != m_pListView->end(); it++ )
{
- if ((m_pListView->automaticSelection()) && (it->isSelected()))
- {
+ if ((m_pListView->automaticSelection()) && (it->isSelected())) {
it->setSelected(FALSE);
//the following line is to prevent that more than one item were selected
//and now get deselected and automaticSelection() was true, this shouldn't happen
//but who knows, aleXXX
m_pListView->deactivateAutomaticSelection();
- };
- if ( re.exactMatch( it->text(0) ) )
- it->setSelected( TRUE);
- };
+ }
+ if ( it->isVisible() ) {
+ if ( re.exactMatch( it->text(0) ) ) {
+ it->setSelected(TRUE);
+ }
+ }
+ else {
+ it->setSelected(FALSE);
+ }
+ }
m_pListView->blockSignals( false );
m_pListView->deactivateAutomaticSelection();
emit m_pListView->selectionChanged();
@@ -418,9 +423,16 @@ void KonqListView::slotUnselect()
m_pListView->blockSignals(TRUE);
- for (KonqBaseListViewWidget::iterator it = m_pListView->begin(); it != m_pListView->end(); it++ )
- if ( re.exactMatch( it->text(0) ) )
+ for (KonqBaseListViewWidget::iterator it = m_pListView->begin(); it != m_pListView->end(); it++ ) {
+ if ( it->isVisible() ) {
+ if ( re.exactMatch( it->text(0) ) ) {
+ it->setSelected(FALSE);
+ }
+ }
+ else {
it->setSelected(FALSE);
+ }
+ }
m_pListView->blockSignals(FALSE);
m_pListView->deactivateAutomaticSelection();