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

List:       kde-commits
Subject:    kdegraphics/ksvg
From:       Rob Buis <rwlbuis () xs4all ! nl>
Date:       2003-09-28 11:03:09
[Download RAW message or body]

CVS commit by buis: 


Cleanup.


  M +15 -15    core/CanvasItems.cpp   1.23
  M +4 -3      impl/SVGTextPositioningElementImpl.cc   1.36


--- kdegraphics/ksvg/core/CanvasItems.cpp  #1.22:1.23
@@ -275,5 +275,6 @@ void CanvasText::createGlyphs(KSVGTextCh
                 }
 
-                params->setBaselineShift(tc->getBaselineShift().latin1());
+                {
+                        T2P::GlyphLayoutParams *params = tc->layoutParams();
                 params->setLetterSpacing(params->letterSpacing() + addLetterSpacing);
 
@@ -288,10 +289,9 @@ void CanvasText::createGlyphs(KSVGTextCh
                 _cury[i + 1] = _cury[i] + (params->tb() ? glyph->ypen() : 0);
 
-                params->setLetterSpacing(params->letterSpacing() - addLetterSpacing);
-
                 if(!glyph)
                         break;
                 else
                         glyphs.append(glyph);
+                }
         }
 

--- kdegraphics/ksvg/impl/SVGTextPositioningElementImpl.cc  #1.35:1.36
@@ -102,4 +102,5 @@ T2P::GlyphLayoutParams *SVGTextPositioni
         params->setTb(style->getTextWritingMode() == TB);
         params->setUseBidi(style->getTextUnicodeBidi() == UBNORMAL);
+        params->setBaselineShift(style->getBaselineShift().latin1());
 
         bool worked = true;


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