From 5763972ed84af8a68ef44b1a17a480f25e0b8ad1 Mon Sep 17 00:00:00 2001
From: EvilSpirit <anandamide@mail.ru>
Date: Mon, 19 Dec 2016 22:39:58 +0700
Subject: [PATCH] Don't apply scale twice for text if both height and stroke
 are in mm.

---
 src/drawconstraint.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/drawconstraint.cpp b/src/drawconstraint.cpp
index ed6f683..6753188 100644
--- a/src/drawconstraint.cpp
+++ b/src/drawconstraint.cpp
@@ -1169,9 +1169,10 @@ s:
             }
 
             if(disp.style.v != 0) {
-                stroke.width = Style::Width(disp.style);
-                if(how == DrawAs::DEFAULT) {
-                    stroke.color = Style::Color(disp.style);
+                RgbaColor color = stroke.color;
+                stroke = Style::Stroke(disp.style);
+                if(how != DrawAs::DEFAULT) {
+                    stroke.color = color;
                 }
                 hcs = canvas->GetStroke(stroke);
             }