[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 5:23:40
Message-ID: 20100728052340.52EC5AC782 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1155806 by mkruisselbrink:

Be more like other spreadsheet applications, and bottom-align bottom aligned text even if it does not fit

 M  +2 -7      CellView.cpp  


--- trunk/koffice/kspread/ui/CellView.cpp #1155805:1155806
@@ -1546,7 +1546,7 @@
             font.setPointSizeF(siz / 2.);
             fontMetrics = QFontMetricsF(font, &device);
             d->calculateTextSize(font, fontMetrics);
-            if (d->fittingWidth)\
+            if (d->fittingWidth)
                 lower = siz;
             else
                 upper = siz - 1;
@@ -1678,13 +1678,8 @@
         } else if (tmpRichText) {
             d->textY = effBottom;
         } else if (tmpMultiRow && !tmpVerticalText) {
-            // Is enough place available?
-            if (effBottom - effTop - d->textHeight > 0) {
                 d->textY = effBottom - d->textHeight + ascent;
-            } else {
-                d->textY = effTop + ascent;
-            }
-        } else {
+        } else { // vertical text
             // Is enough place available?
             if (effBottom - effTop - d->textHeight > 0) {
                 d->textY = effBottom - d->textHeight + ascent;
[prev in list] [next in list] [prev in thread] [next in thread]