[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/transitions
From:       Hugo Pereira Da Costa <hugo.pereira () free ! fr>
Date:       2010-02-20 3:37:03
Message-ID: 1266637023.611796.15910.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1093061 by hpereiradacosta:

Backport: r1093060
Do not animate QLabel transitions when the QLabel icon is changed.
CCBUG: 220621                                                      



 M  +3 -2      oxygenlabeldata.cpp  


--- branches/KDE/4.4/kdebase/runtime/kstyles/oxygen/transitions/oxygenlabeldata.cpp \
#1093060:1093061 @@ -61,12 +61,13 @@
 
             case QEvent::Paint:
             {
-                if( enabled() && target_ && ( target_.data()->text() != text_ || \
target_.data()->pixmap() != pixmap_ ) ) +                //if( enabled() && target_ \
&& ( target_.data()->text() != text_ || target_.data()->pixmap() != pixmap_ ) ) +     \
if( enabled() && target_ && target_.data()->text() != text_ )  {
 
                     // update text and pixmap
                     text_ = target_.data()->text();
-                    pixmap_ = target_.data()->pixmap();
+                    // pixmap_ = target_.data()->pixmap();
 
                     if( transition().data()->isAnimated() )
                     { transition().data()->endAnimation(); }


[prev in list] [next in list] [prev in thread] [next in thread]