From kde-commits Wed Nov 19 20:09:11 2008 From: =?utf-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Wed, 19 Nov 2008 20:09:11 +0000 To: kde-commits Subject: KDE/kdelibs/kdeui Message-Id: <1227125351.759740.18240.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=122712537218903 SVN commit 886671 by ereslibre: Remove builtin effects on KPageView (because the style will provide it if it wants). Also, if the user selected some kind of simple animations, animate treeviews expanding/collapsing nodes M +5 -1 kernel/kstyle.cpp M +0 -8 paged/kpageview.cpp --- trunk/KDE/kdelibs/kdeui/kernel/kstyle.cpp #886670:886671 @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include @@ -399,6 +399,10 @@ // Enable hover effects in all itemviews if (QAbstractItemView *itemView = qobject_cast(w) ) { itemView->viewport()->setAttribute(Qt::WA_Hover); + + if (QTreeView *treeView = qobject_cast(w)) { + treeView->setAnimated(KGlobalSettings::graphicEffectsLevel() & KGlobalSettings::SimpleAnimationEffects); + } } QCommonStyle::polish(w); --- trunk/KDE/kdelibs/kdeui/paged/kpageview.cpp #886670:886671 @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -219,8 +218,6 @@ if (faceType != KPageView::Tabbed) { QWidget *widget = qvariant_cast( model->data( index, KPageModel::WidgetRole ) ); - KFadeWidgetEffect *effect = new KFadeWidgetEffect(stack); - if ( widget ) { if ( stack->indexOf( widget ) == -1 ) { // not included yet stack->addWidget( widget ); @@ -232,7 +229,6 @@ } updateTitleWidget(index); - effect->start(); } Q_Q(KPageView); @@ -243,8 +239,6 @@ { Q_Q(KPageView); - KFadeWidgetEffect *effect = new KFadeWidgetEffect( titleWidget ); - QString header = model->data( index, KPageModel::HeaderRole ).toString(); if ( header.isNull() ) { //TODO KDE5 remove that ugly logic, see also doxy-comments in KPageWidgetItem::setHeader() header = model->data( index, Qt::DisplayRole ).toString(); @@ -255,8 +249,6 @@ const QIcon icon = model->data( index, Qt::DecorationRole ).value(); titleWidget->setPixmap( icon.pixmap( 22, 22 ) ); titleWidget->setVisible(q->showPageHeader()); - - effect->start(); } void KPageViewPrivate::_k_dataChanged(const QModelIndex &, const QModelIndex &)