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

List:       kde-commits
Subject:    KDE/kdegames/kpat
From:       Parker Coates <parker.coates () gmail ! com>
Date:       2009-08-21 20:06:05
Message-ID: 1250885165.106793.30824.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1014186 by coates:

Removed an obsolete optimisation that painted the opaque part of the card differently.

 M  +1 -33     card.cpp  
 M  +0 -5      cardmaps.cpp  
 M  +0 -1      cardmaps.h  


--- trunk/KDE/kdegames/kpat/card.cpp #1014185:1014186
@@ -469,40 +469,8 @@
     //painter->drawPixmap(exposed, pixmap(), exposed );
     //kDebug(11111) << "exposed" << exposed;
 
-    QRect body = cardMap::self()->opaqueRect();
-    QMatrix m = painter->combinedMatrix();
-    bool isi = qFuzzyCompare( m.m11(), 1 ) &&
-               qFuzzyCompare( m.m22(), 1 ) &&
-               qFuzzyCompare( m.m12(), 0 ) &&
-               qFuzzyCompare( m.m21(), 0 );
-    painter->setRenderHint( QPainter::SmoothPixmapTransform, !isi );
-    painter->setRenderHint( QPainter::Antialiasing, !isi );
+    painter->drawPixmap( QPointF( 0, 0 ), pixmap() );
 
-    if ( body.isValid() && isi )
-    {
-        painter->setCompositionMode(QPainter::CompositionMode_Source);
-
-        //body = exposed.intersected( body );//.adjusted(-1, -1, 2, 2);
-        painter->drawPixmap( body.topLeft(), pixmap(), body );
-        painter->setCompositionMode(QPainter::CompositionMode_SourceOver );
-        QRectF hori( QPointF( 0, 0 ), QSizeF( pixmap().width(), body.top() ) );
-        if ( exposed.intersects( hori ) )
-            painter->drawPixmap( hori.topLeft(), pixmap(), hori );
-        hori.moveTop( body.bottom() );
-        hori.setHeight( pixmap().height() - body.bottom() );
-        if ( exposed.intersects( hori ) )
-            painter->drawPixmap( hori.topLeft(), pixmap(), hori );
-        QRectF vert( QPointF( 0, body.top() ),
-                     QSizeF( body.left(),  body.height() ) );
-        if ( vert.width() != 0 && exposed.intersects( vert ) )
-            painter->drawPixmap( vert.topLeft(), pixmap(), vert );
-        vert.moveLeft( body.right() );
-        vert.setWidth( pixmap().width() - body.right() );
-        if ( vert.width() != 0 && exposed.intersects( vert ) )
-            painter->drawPixmap( vert.topLeft(), pixmap(), vert );
-    } else
-         painter->drawPixmap( QPointF( 0, 0 ), pixmap() );
-
     if ( isHighlighted() ) {
         painter->setRenderHint( QPainter::SmoothPixmapTransform, true );
         painter->setRenderHint( QPainter::Antialiasing, true );
--- trunk/KDE/kdegames/kpat/cardmaps.cpp #1014185:1014186
@@ -143,11 +143,6 @@
     return _self;
 }
 
-QRect cardMap::opaqueRect() const
-{
-    return QRect();
-}
-
 QPixmap cardMap::renderBackside( int variant )
 {
     QPixmap pix = d->m_cache.backside( variant );
--- trunk/KDE/kdegames/kpat/cardmaps.h #1014185:1014186
@@ -47,7 +47,6 @@
 
     QPixmap renderBackside( int variant = -1 );
     QPixmap renderFrontside( Card::Rank, Card::Suit );
-    QRect opaqueRect() const;
 
     void updateTheme(const KConfigGroup &cg);
 
[prev in list] [next in list] [prev in thread] [next in thread]