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

List:       kde-commits
Subject:    koffice/kchart/shape
From:       Johannes Simon <johannes.simon () gmail ! com>
Date:       2008-08-10 21:42:55
Message-ID: 1218404575.309813.16532.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 844908 by jsimon:

Fix chart relayouting issues

 M  +1 -1      Axis.cpp  
 M  +3 -3      ChartTool.cpp  
 M  +5 -3      PlotArea.cpp  


--- trunk/koffice/kchart/shape/Axis.cpp #844907:844908
@@ -967,7 +967,7 @@
         d->kdLineDiagram->doItemsLayout();
         d->kdLineDiagram->update();
     }
-    d->plotArea->parent()->relayout();
+    d->plotArea->parent()->requestRepaint();
 }
 
 KDChart::CartesianAxis *Axis::kdAxis() const
--- trunk/koffice/kchart/shape/ChartTool.cpp #844907:844908
@@ -490,7 +490,7 @@
     if ( !d->shape )
         return;
     d->shape->proxyModel()->setDataDirection( direction );
-    d->shape->update();
+    d->shape->relayout();
 }
 
 void ChartTool::setFirstRowIsLabel( bool b )
@@ -498,7 +498,7 @@
     Q_ASSERT( d->shape );
     if ( d->shape != 0 )
         d->shape->proxyModel()->setFirstRowIsLabel( b );
-    d->shape->update();
+    d->shape->relayout();
 }
 
 void ChartTool::setFirstColumnIsLabel( bool b )
@@ -506,7 +506,7 @@
     Q_ASSERT( d->shape );
     if ( d->shape != 0 )
         d->shape->proxyModel()->setFirstColumnIsLabel( b );
-    d->shape->update();
+    d->shape->relayout();
 }
 
 
--- trunk/koffice/kchart/shape/PlotArea.cpp #844907:844908
@@ -781,9 +781,10 @@
 
 void PlotArea::update() const
 {
+    requestRepaint();
     foreach( Axis* axis, d->axes )
         axis->update();
-    relayout();
+    KoShape::update();
 }
 
 void PlotArea::requestRepaint() const
@@ -873,8 +874,9 @@
 
 void PlotArea::relayout() const
 {
-    d->pixmapRepaintRequested = true;
-    KoShape::update();
+    Q_ASSERT( d->kdPlane );
+    d->kdPlane->relayout();
+    update();
 }
 
 #include "PlotArea.moc"
[prev in list] [next in list] [prev in thread] [next in thread]