comparison layer/PaintAssistant.cpp @ 1374:631897ba9fca zoom

Merge from default branch

         std::cerr << "ERROR: PaintAssistant::drawVisibleText: Boxed style not yet implemented!" << std::endl;
     }
 }
 
 double
-PaintAssistant::scalePenWidth(double width)
+PaintAssistant::scaleSize(double size)
 {
     static double ratio = 0.0;
     if (ratio == 0.0) {
         double baseEm;
 #ifdef Q_OS_MAC

         baseEm = 15.0;
 #endif
         double em = QFontMetrics(QFont()).height();
         ratio = em / baseEm;
 
-        SVDEBUG << "PaintAssistant::scalePenWidth: ratio is " << ratio
+        SVDEBUG << "PaintAssistant::scaleSize: ratio is " << ratio
                 << " (em = " << em << ")" << endl;
-    }
-
-    if (ratio <= 1.0) {
-        // we only ever scale up in this method
-        return width;
-    }
-
+
+        if (ratio < 1.0) {
+            SVDEBUG << "PaintAssistant::scaleSize: rounding ratio up to 1.0"
+                    << endl;
+            ratio = 1.0;
+        }
+    }
+
+    return size * ratio;
+}
+
+double
+PaintAssistant::scalePenWidth(double width)
+{
     if (width <= 0) {
         // zero-width pen, produce a scaled one-pixel pen
-        return ratio;
-    }
-
-    return width * ratio;
+        width = 1;
+    }
+
+    return scaleSize(width);
 }
 
 QPen
 PaintAssistant::scalePen(QPen pen)
 {