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

List:       kde-commits
Subject:    playground/libs/popupdropper
From:       Jeff Mitchell <kde-dev () emailgoeshere ! com>
Date:       2008-06-30 21:24:58
Message-ID: 1214861098.912797.18990.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 826517 by mitchell:

Fix separators animating like borders


 M  +7 -0      popupdropper/PopupDropperItem.cpp  
 M  +1 -0      popupdropper/PopupDropperItem_p.h  
 M  +2 -0      testapp/dragdroprobot/coloritem.cpp  


--- trunk/playground/libs/popupdropper/popupdropper/PopupDropperItem.cpp \
#826516:826517 @@ -46,6 +46,7 @@
     , customBaseTextColor( false )
     , customHoveredTextColor( false )
     , customHoveredBorderColor( false )
+    , separator( false )
     , pd( 0 )
     , q( parent )
     {
@@ -104,6 +105,8 @@
             QGraphicsSvgItem::setSharedRenderer( pudaction->renderer() );
         if( !pudaction->elementId().isEmpty() )
             QGraphicsSvgItem::setElementId( pudaction->elementId() );
+        if( pudaction->isSeparator() )
+            d->separator = true;
     }
 }
 
@@ -324,6 +327,8 @@
 
 void PopupDropperItem::hoverFinished() //SLOT
 {
+    if( d->separator )
+        return;
     qDebug() << "PopupDropperItem timeout";
     if( d->action && d->hoverTimer.direction() == QTimeLine::Forward )
         d->action->activate( QAction::Hover );
@@ -337,6 +342,8 @@
 
 void PopupDropperItem::hoverFrameChanged( int frame ) //SLOT
 {
+    if( d->separator )
+        return;
     int range = d->hoverTimer.endFrame() - d->hoverTimer.startFrame();
     qreal multiplier = ( 1.0 * frame ) / range;
     int r = (int)( ( d->hoveredTextColor.red() - d->baseTextColor.red() ) * \
                multiplier ) + d->baseTextColor.red();
--- trunk/playground/libs/popupdropper/popupdropper/PopupDropperItem_p.h \
#826516:826517 @@ -50,6 +50,7 @@
     bool customBaseTextColor;
     bool customHoveredTextColor;
     bool customHoveredBorderColor;
+    bool separator;
     PopupDropper* pd;
 
 private:
--- trunk/playground/libs/popupdropper/testapp/dragdroprobot/coloritem.cpp \
#826516:826517 @@ -345,6 +345,7 @@
     pdi->setFont( font );
     //pdi->setBaseTextColor( color );
     pdi->setHoveredTextColor( QColor( 153, 23, 83 ) );
+    pdi->setHoveredBorderColor( QColor( 122, 184, 21 ) );
     pd->addItem( pdi, false );
 
     font.setBold( false );
@@ -361,6 +362,7 @@
     pdi->setFont( font );
     //pdi->setBaseTextColor( color );
     pdi->setHoveredTextColor( QColor( 153, 23, 83 ) );
+    pdi->setHoveredBorderColor( QColor( 122, 184, 21 ) );
     pd->addItem( pdi, false );
 
     return pd;


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