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

List:       kde-commits
Subject:    kdenonbeta
From:       Rob Buis <rwlbuis () xs4all ! nl>
Date:       2005-10-23 17:50:23
Message-ID: 1130089823.008373.10004.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 473445 by buis:

Move the stroke width value, we need it too when stroke=none, for instance for markerUnits=strokeWidth.


 M  +3 -2      kcanvas/KCanvasTreeDebug.cpp  
 M  +12 -0     kcanvas/device/KRenderingStyle.cpp  
 M  +2 -2      kcanvas/device/agg/KCanvasAggHelper.h  
 M  +2 -1      ksvg2/misc/KCanvasRenderingStyle.cpp  


--- trunk/kdenonbeta/kcanvas/KCanvasTreeDebug.cpp #473444:473445
@@ -165,8 +165,6 @@
 
     if (p->opacity() != 1.0f)
         ts << s << "[opacity=" << p->opacity() << "]";
-    if (p->strokeWidth() != 1.0f)
-        ts << s << "[stroke width=" << p->strokeWidth() << "]";
     if (p->strokeMiterLimit() != 4)
         ts << s << "[miter limit=" << p->strokeMiterLimit() << "]";
     if (p->strokeCapStyle() != 1)
@@ -242,6 +240,9 @@
     if (o.style()->isStroked() 
         && DIFFERS_FROM_PARENT_AVOID_TEST_IF_FALSE(style()->isStroked(), style()->strokePainter()))
         ts << " [stroke=" << o.style()->strokePainter() << "]";
+    if (o.style()->strokeWidth() != 1.0f
+        && DIFFERS_FROM_PARENT(style()->strokeWidth()))
+        ts << "[stroke width=" << o.style()->strokeWidth() << "]";
     if (o.style()->isFilled() 
         && DIFFERS_FROM_PARENT_AVOID_TEST_IF_FALSE(style()->isFilled(), style()->fillPainter()))
         ts << " [fill=" << o.style()->fillPainter() << "]";
--- trunk/kdenonbeta/kcanvas/device/KRenderingStyle.cpp #473444:473445
@@ -45,6 +45,7 @@
         imageRendering = IR_OPTIMIZE_QUALITY;
 
         opacity = 1.0f;
+        strokeWidth = 1.0f;
     }
 
     ~Private()
@@ -61,6 +62,7 @@
 
     KRenderingFillPainter *fillPainter;
     KRenderingStrokePainter *strokePainter;
+    double strokeWidth;
 
     bool visible : 1;
 
@@ -120,6 +122,16 @@
     }
 }
 
+double KRenderingStyle::strokeWidth() const
+{
+    return d->strokeWidth;
+}
+
+void KRenderingStyle::setStrokeWidth(double _strokeWidth)
+{
+    d->strokeWidth = _strokeWidth;
+}
+
 // Fill (aka Bush) properties
 bool KRenderingStyle::isFilled() const
 {
--- trunk/kdenonbeta/kcanvas/device/agg/KCanvasAggHelper.h #473444:473445
@@ -114,7 +114,7 @@
         KRenderingStrokePainter *paintServer = style->strokePainter();        
         Q_ASSERT(paintServer != 0);
 
-        m_s.width(paintServer->strokeWidth());
+        m_s.width(style->strokeWidth());
         m_s.miter_limit(paintServer->strokeMiterLimit());
 
         m_s.line_cap(toAggLineCap(paintServer->strokeCapStyle()));
@@ -138,7 +138,7 @@
 
         m_d.dash_start(paintServer->dashOffset());
 
-        m_ds.width(paintServer->strokeWidth());
+        m_ds.width(style->strokeWidth());
         m_ds.miter_limit(paintServer->strokeMiterLimit());
 
         m_ds.line_cap(toAggLineCap(paintServer->strokeCapStyle()));
--- trunk/kdenonbeta/ksvg2/misc/KCanvasRenderingStyle.cpp #473444:473445
@@ -112,6 +112,8 @@
 
     SVGPaintImpl *stroke = m_style->strokePaint();
 
+    setStrokeWidth(cssPrimitiveToLength(item, m_style->strokeWidth(), 1.0));
+
     if (!stroke || stroke->paintType() == SVG_PAINTTYPE_NONE)
         return;
 
@@ -139,7 +141,6 @@
     }
 
     strokePainter()->setOpacity(m_style->strokeOpacity());
-    strokePainter()->setStrokeWidth(cssPrimitiveToLength(item, m_style->strokeWidth(), 1.0));
 
     KDOM::CSSValueListImpl *dashes = m_style->strokeDashArray();
     if(dashes)
[prev in list] [next in list] [prev in thread] [next in thread]