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

List:       kde-commits
Subject:    koffice/lib/kformula
From:       Ulrich Kuettler <ulrich.kuettler () mailbox ! tu-dresden ! de>
Date:       2003-08-20 18:38:38
[Download RAW message or body]

CVS commit by kuettler: 

parenthesis problem fix as suggested by Rodolfo Conde Martínez <rcm@gmx.co.uk>


  M +11 -5     bracketelement.cc   1.55


--- koffice/lib/kformula/bracketelement.cc  #1.54:1.55
@@ -59,4 +59,10 @@ SingleContentElement::~SingleContentElem
 QChar SingleContentElement::getCharacter() const
 {
+    // This is meant to make the SingleContentElement text only.
+    // This "fixes" the parenthesis problem (parenthesis too large).
+    // I'm not sure if we really want this. There should be better ways.
+    if ( content->isTextOnly() ) {
+        return '\\';
+    }
     return content->getCharacter();
 }
@@ -503,5 +509,5 @@ void OverlineElement::calcSizes(const Co
 
     setWidth( content->getWidth() );
-    setHeight( content->getHeight() + distY*2 );
+    setHeight( content->getHeight() + distY );
 
     content->setX( 0 );
@@ -603,5 +609,5 @@ void UnderlineElement::calcSizes(const C
 
     setWidth( content->getWidth() );
-    setHeight( content->getHeight() + distY*2 );
+    setHeight( content->getHeight() + distY );
 
     content->setX( 0 );
@@ -627,5 +633,5 @@ void UnderlineElement::draw( QPainter& p
     luPixel y = myPos.y();
     //int distX = style.getDistanceX(tstyle);
-    luPixel distY = style.ptToPixelY( style.getThinSpace( tstyle ) );
+    //luPixel distY = style.ptToPixelY( style.getThinSpace( tstyle ) );
     //luPixel unit = (content->getHeight() + distY)/ 3;
 
@@ -634,7 +640,7 @@ void UnderlineElement::draw( QPainter& p
 
     painter.drawLine( style.layoutUnitToPixelX( x ),
-                      style.layoutUnitToPixelY( y+getHeight()-distY ),
+                      style.layoutUnitToPixelY( y+getHeight()-style.getLineWidth() ),
                       style.layoutUnitToPixelX( x+content->getWidth() ),
-                      style.layoutUnitToPixelY( y+getHeight()-distY ) );
+                      style.layoutUnitToPixelY( y+getHeight()-style.getLineWidth() ) );
 }
 


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