Mercurial > hg > svgui

changeset 981:50940a7425ae osx-retina

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Tue, 30 Jun 2015 14:16:22 +0100
parents 66da6f009edd (current diff) bc23c2cfff65 (diff)
children 5d4730da0276
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/layer/Colour3DPlotLayer.cpp	Tue Jun 30 14:14:34 2015 +0100
+++ b/layer/Colour3DPlotLayer.cpp	Tue Jun 30 14:16:22 2015 +0100
@@ -869,7 +869,7 @@
         paint.save();
 
         QFont font = paint.font();
-        font.setPixelSize(font.pixelSize() * 0.65);
+        font.setPixelSize(int(font.pixelSize() * 0.65));
         paint.setFont(font);
 
         int msw = paint.fontMetrics().width(maxstr);
@@ -920,7 +920,7 @@
             if (paint.fontMetrics().height() >= h) {
                 if (h >= defaultFontHeight * 0.8) {
                     QFont tf = paint.font();
-                    tf.setPixelSize(h * 0.8);
+                    tf.setPixelSize(int(h * 0.8));
                     paint.setFont(tf);
                 } else {
                     continue;