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

List:       kde-commits
Subject:    kdenonbeta/ksvg2
From:       Rob Buis <rwlbuis () xs4all ! nl>
Date:       2005-01-07 18:57:03
Message-ID: 20050107185703.5AFBA1BBC5 () office ! kde ! org
[Download RAW message or body]

CVS commit by buis: 

Handle join and cap styles.


  M +3 -3      css/impl/SVGRenderStyle.h   1.18
  M +2 -2      css/impl/SVGRenderStyleDefs.h   1.4
  M +2 -0      impl/SVGStyledElementImpl.cc   1.29


--- kdenonbeta/ksvg2/impl/SVGStyledElementImpl.cc  #1.28:1.29
@@ -183,4 +183,6 @@ void SVGStyledElementImpl::attach()
 
                                 \
renderingStyle->strokePainter()->setStrokeWidth(svgStyle->strokeWidth().value()); +   \
renderingStyle->strokePainter()->setStrokeJoinStyle((KCJoinStyle)svgStyle->joinStyle());
 +                                \
                renderingStyle->strokePainter()->setStrokeCapStyle((KCCapStyle)svgStyle->capStyle());
                
                                 \
                renderingStyle->strokePainter()->setOpacity(svgStyle->strokeOpacity());
                
                                 \
renderingStyle->strokePainter()->setPaintServer(strokePainter);

--- kdenonbeta/ksvg2/css/impl/SVGRenderStyleDefs.h  #1.3:1.4
@@ -50,10 +50,10 @@ namespace KSVG
         enum ECapStyle
         {
-                CS_BUTT, CS_ROUND, CS_SQUARE
+                CS_BUTT = 1, CS_ROUND = 2, CS_SQUARE = 4
         };
 
         enum EJoinStyle
         {
-                JS_MITER, JS_ROUND, JS_BEVEL
+                JS_MITER = 1, JS_ROUND = 2, JS_BEVEL = 4
         };
 

--- kdenonbeta/ksvg2/css/impl/SVGRenderStyle.h  #1.17:1.18
@@ -86,6 +86,6 @@ namespace KSVG
                                         EWindRule _clipRule : 1; 
                                         EWindRule _fillRule : 1;
-                                        ECapStyle _capStyle : 2;
-                                        EJoinStyle _joinStyle : 2;
+                                        ECapStyle _capStyle : 3;
+                                        EJoinStyle _joinStyle : 3;
                                         ETextAnchor _textAnchor : 2;
                                         EColorInterpolation _colorInterpolation : 2;
@@ -93,5 +93,5 @@ namespace KSVG
                                         EPointerEvents _pointerEvents : 4;
 
-                                        unsigned int unused : 32;
+                                        unsigned int unused : 30;
                                         unsigned int unused2 : 8;
                                 } f;


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