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

List:       kde-commits
Subject:    koffice/karbon/widgets
From:       Jan Hambrecht <jaham () gmx ! net>
Date:       2008-01-18 1:00:43
Message-ID: 1200618043.542412.9466.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 762858 by jaham:

remove static checkerboard painter from KarbonGradientItem so that karbon runs again



 M  +4 -5      KarbonGradientItem.cpp  
 M  +2 -2      KarbonGradientItem.h  
 M  +4 -3      vgradienttabwidget.cc  
 M  +2 -0      vgradienttabwidget.h  


--- trunk/koffice/karbon/widgets/KarbonGradientItem.cpp #762857:762858
@@ -26,10 +26,8 @@
 
 #include <QtGui/QPainter>
 
-KoCheckerBoardPainter KarbonGradientItem::m_checkerPainter( 4 );
-
-KarbonGradientItem::KarbonGradientItem( KoAbstractGradient * gradient )
-    : KoResourceItem( gradient )
+KarbonGradientItem::KarbonGradientItem( KoAbstractGradient * gradient, \
KoCheckerBoardPainter * checkerPainter ) +    : KoResourceItem( gradient ), \
m_checkerPainter( checkerPainter )  {
     Q_ASSERT( gradient );
     //setSizeHint( QSize( 200, 16 ) );
@@ -47,7 +45,8 @@
 
     QImage image( thumbSize, QImage::Format_ARGB32 );
     QPainter painter( &image );
-    m_checkerPainter.paint( painter, image.rect() );
+    if( m_checkerPainter )
+        m_checkerPainter->paint( painter, image.rect() );
     painter.fillRect( QRect( 0, 0, image.width(), image.height() ), QBrush( \
paintGradient ) );  
     delete g;
--- trunk/koffice/karbon/widgets/KarbonGradientItem.h #762857:762858
@@ -28,7 +28,7 @@
 class KarbonGradientItem : public KoResourceItem
 {
 public:
-    KarbonGradientItem( KoAbstractGradient * gradient );
+    KarbonGradientItem( KoAbstractGradient * gradient, KoCheckerBoardPainter * \
checkerPainter );  
     /// reimplemented from QTableWidgetItem
     virtual QVariant data ( int role ) const;
@@ -36,7 +36,7 @@
     KoAbstractGradient * gradient();
 
 private:
-    static KoCheckerBoardPainter m_checkerPainter;
+    KoCheckerBoardPainter * m_checkerPainter;
     QImage thumbnail( const QSize &thumbSize ) const;
 };
 
--- trunk/koffice/karbon/widgets/vgradienttabwidget.cc #762857:762858
@@ -281,7 +281,8 @@
 }
 
 VGradientTabWidget::VGradientTabWidget( QWidget* parent )
-    : QTabWidget( parent ), m_gradient( 0 ), m_resourceServer( 0 ), \
m_resourceAdapter(0), m_gradOpacity( 1.0 ) +    : QTabWidget( parent ), m_gradient( 0 \
), m_resourceServer( 0 ), m_resourceAdapter(0) +    , m_gradOpacity( 1.0 ), \
m_checkerPainter( 4 )  {
     // create a default gradient
     m_gradient = new QLinearGradient( QPointF(0,0), QPointF(100,100) );
@@ -422,7 +423,7 @@
     if( gradients.count() > 0 )
     {
         foreach( KoAbstractGradient * gradient, gradients ) {
-            m_predefGradientsView->addItem( new KarbonGradientItem( gradient ) );
+            m_predefGradientsView->addItem( new KarbonGradientItem( gradient, \
&m_checkerPainter ) );  }
     }
 }
@@ -644,7 +645,7 @@
     KoAbstractGradient * gradient = dynamic_cast<KoAbstractGradient*>( resource );
 
     if( gradient && gradient->valid() ) {
-        KarbonGradientItem* item = new KarbonGradientItem( gradient );
+        KarbonGradientItem* item = new KarbonGradientItem( gradient, \
&m_checkerPainter );  m_itemMap[resource] = item;
         m_predefGradientsView->addItem(item);
     }
--- trunk/koffice/karbon/widgets/vgradienttabwidget.h #762857:762858
@@ -31,6 +31,7 @@
 #include <KoResourceServer.h>
 #include <KoResourceServerAdapter.h>
 #include <KoAbstractGradient.h>
+#include <KoCheckerBoardPainter.h>
 
 class KComboBox;
 class VGradientWidget;
@@ -161,6 +162,7 @@
     KoResourceServerAdapter<KoAbstractGradient> * m_resourceAdapter;
     double m_gradOpacity;    ///< the gradient opacity
     QMap<KoResource*, KoResourceItem*> m_itemMap;
+    KoCheckerBoardPainter m_checkerPainter;
 };
 
 /// helper function to clone a gradient


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