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

List:       kde-commits
Subject:    koffice/kspread/ui
From:       Marijn Kruisselbrink <m.kruisselbrink () student ! tue ! nl>
Date:       2010-07-28 8:03:57
Message-ID: 20100728080357.B05E3AC782 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1155938 by mkruisselbrink:

also always keep rotated text bottom aligned, even if it does not fit

 M  +0 -9      CellView.cpp  


--- trunk/koffice/kspread/ui/CellView.cpp #1155937:1155938
@@ -1657,8 +1657,6 @@
         if (!tmpVerticalText && !tmpMultiRow && !tmpAngle && !tmpRichText) {
             d->textY = effBottom;
         } else if (tmpAngle != 0) {
-            // Is enough place available?
-            if (effBottom - effTop - d->textHeight > 0) {
                 if (tmpAngle < 0) {
                     d->textY = effBottom - d->textHeight;
                 } else {
@@ -1667,13 +1665,6 @@
                 if (tmpAngle < -90 || tmpAngle > 90) {
                     d->textY += ascent * ::cos(tmpAngle * M_PI / 180);
                 }
-            } else {
-                if (tmpAngle < 0) {
-                    d->textY = effTop;
-                } else {
-                    d->textY = effTop + ascent * ::cos(tmpAngle * M_PI / 180);
-                }
-            }
         } else if (tmpRichText) {
             d->textY = effBottom;
         } else if (tmpMultiRow && !tmpVerticalText) {
[prev in list] [next in list] [prev in thread] [next in thread]