summaryrefslogtreecommitdiffstats
path: root/konqueror
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-07 23:25:18 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-03 03:26:37 +0200
commitebd378ce6ad335aa419192a4fe1843e06cb98eb2 (patch)
treeb5585366c127f0f426f326133d75e3d28d1a8440 /konqueror
parent6fda11697705e7c5d061694a32fc2248d334bab7 (diff)
downloadtdebase-ebd378ce6ad335aa419192a4fe1843e06cb98eb2.tar.gz
tdebase-ebd378ce6ad335aa419192a4fe1843e06cb98eb2.zip
Repair incorrectly show icon activation effect in List View when said effects are disabled
This closes Bug 335 (cherry picked from commit 398f6a122a0bb13043681d7f331e45d5ece56bdb)
Diffstat (limited to 'konqueror')
-rw-r--r--konqueror/listview/konq_listviewwidget.cc9
1 files changed, 6 insertions, 3 deletions
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cc
index d2f42a66b..4b79866db 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cc
@@ -1009,9 +1009,12 @@ void KonqBaseListViewWidget::slotReturnPressed( TQListViewItem *_item )
// gather pixmap
TQPixmap *pix = new TQPixmap(*(_item->pixmap(0)));
- // call the icon effect
- KIconEffect::visualActivate(viewport(), rect, pix);
-
+ // call the icon effect if enabled
+ if (KGlobalSettings::showKonqIconActivationEffect() == true) {
+ KIconEffect::visualActivate(viewport(), rect, pix);
+ }
+
+ // clean up
delete(pix);
}
}