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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/desktop/applets/tasks
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2010-05-22 1:27:04
Message-ID: 20100522012704.729FDAC8BC () svn ! kde ! org
[Download RAW message or body]

SVN commit 1129343 by aseigo:

check the size whenever we switch the prefix; i find the behaviour of having \
different sizes cached for each frame element in an svg to be rather dubious; will \
have to discuss with marco if we really need this behaviour. BUG:217660


 M  +13 -3     abstracttaskitem.cpp  


--- trunk/KDE/kdebase/workspace/plasma/desktop/applets/tasks/abstracttaskitem.cpp \
#1129342:1129343 @@ -589,14 +589,14 @@
     */
     Plasma::FrameSvg *itemBackground = m_applet->itemBackground();
 
+    if (~option->state & QStyle::State_Sunken && 
+        (!m_backgroundFadeAnim || m_backgroundFadeAnim->state() != \
QAbstractAnimation::Running)) { +        \
                itemBackground->setElementPrefix(m_backgroundPrefix);
     //since a single framesvg is shared between all tasks, we could have to resize \
it even if there wasn't a resizeevent  if (size().toSize() != \
itemBackground->frameSize()) {  resizeBackground(size().toSize());
     }
 
-    if (~option->state & QStyle::State_Sunken && 
-        (!m_backgroundFadeAnim || m_backgroundFadeAnim->state() != \
                QAbstractAnimation::Running)) {
-        itemBackground->setElementPrefix(m_backgroundPrefix);
         if (itemBackground->frameSize() == m_activeRect.size().toSize()) {
             itemBackground->paintFrame(painter, m_activeRect.topLeft());
         } else {
@@ -607,6 +607,11 @@
     }
 
     itemBackground->setElementPrefix(m_oldBackgroundPrefix);
+    //since a single framesvg is shared between all tasks, we could have to resize \
it even if there wasn't a resizeevent +    if (size().toSize() != \
itemBackground->frameSize()) { +        resizeBackground(size().toSize());
+    }
+
     QPixmap oldBackground;
 
     if (option->state & QStyle::State_Sunken) {
@@ -618,6 +623,11 @@
     }
 
     itemBackground->setElementPrefix(m_backgroundPrefix);
+    //since a single framesvg is shared between all tasks, we could have to resize \
it even if there wasn't a resizeevent +    if (size().toSize() != \
itemBackground->frameSize()) { +        resizeBackground(size().toSize());
+    }
+
     QPixmap result = Plasma::PaintUtils::transition(oldBackground, \
itemBackground->framePixmap(), m_alpha);  
     if (result.size() == m_activeRect.size().toSize()) {


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