diff layer/PaintAssistant.h @ 1374:631897ba9fca zoom

Merge from default branch

--- a/layer/PaintAssistant.h	Fri Oct 05 10:25:52 2018 +0100
+++ b/layer/PaintAssistant.h	Tue Nov 06 08:59:03 2018 +0000
@@ -49,9 +49,18 @@
                                 QString text, TextStyle style);
 
     /**
+     * Scale up a size in pixels for a hi-dpi display without pixel
+     * doubling. This is like ViewManager::scalePixelSize, but taking
+     * and returning floating-point values rather than integer
+     * pixels. It is also a little more conservative - it never
+     * shrinks the size, it can only increase or leave it unchanged.
+     */
+    static double scaleSize(double size);
+
+    /**
      * Scale up pen width for a hi-dpi display without pixel doubling.
-     * Very similar to ViewManager::scalePixelSize, but a bit more
-     * conservative.
+     * This is like scaleSize except that it also scales the
+     * zero-width case.
      */
     static double scalePenWidth(double width);