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

List:       kde-commits
Subject:    koffice
From:       Jan Hambrecht <jaham () gmx ! net>
Date:       2009-07-31 21:47:04
Message-ID: 1249076824.957365.32240.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1005370 by jaham:

correctly initialize clipping and filter rects in KoFilterEffect
do not set clipping and filter rect for now when adding new filter to filter stack


 M  +0 -9      karbon/plugins/tools/filterEffectTool/FilterEffectEditWidget.cpp  
 M  +0 -4      karbon/plugins/tools/filterEffectTool/KarbonFilterEffectsTool.cpp  
 M  +3 -1      libs/flake/KoFilterEffect.cpp  


--- trunk/koffice/karbon/plugins/tools/filterEffectTool/FilterEffectEditWidget.cpp #1005369:1005370
@@ -106,16 +106,7 @@
 
     KoFilterEffect * effect = factory->createFilterEffect();
     
-    QRectF bbox(0,0,1,1);
     if (m_shape) {
-        bbox = QRectF(QPointF(), m_shape->size());
-    }
-    
-    QRectF clipRect(-0.1*bbox.width(), -0.1*bbox.height(), 1.2*bbox.width(), 1.2*bbox.height());
-    effect->setClipRect(clipRect);
-    effect->setFilterRect(clipRect);
-    
-    if (m_shape) {
         int shapeFilterCount = m_shape->filterEffectStack().count();
         m_shape->update();
         m_shape->insertFilterEffect(shapeFilterCount, effect);
--- trunk/koffice/karbon/plugins/tools/filterEffectTool/KarbonFilterEffectsTool.cpp #1005369:1005370
@@ -166,10 +166,6 @@
     
     KoFilterEffect * effect = factory->createFilterEffect();
     
-    QRectF clipRect(-0.1*bbox.width(), -0.1*bbox.height(), 1.2*bbox.width(), 1.2*bbox.height());
-    effect->setClipRect(clipRect);
-    effect->setFilterRect(clipRect);
-    
     int shapeFilterCount = shape->filterEffectStack().count();
     shape->update();
     shape->insertFilterEffect(shapeFilterCount, effect);
--- trunk/koffice/libs/flake/KoFilterEffect.cpp #1005369:1005370
@@ -26,7 +26,9 @@
 
 struct KoFilterEffect::Private {
     Private()
-        : requiredInputCount(1), maximalInputCount(1)
+        : clipRect(-0.1, -0.1, 1.2, 1.2)
+        , filterRect(0, 0, 1, 1)
+        , requiredInputCount(1), maximalInputCount(1)
     {}
     
     QString id;
[prev in list] [next in list] [prev in thread] [next in thread]