From: Jean-Marc Lasgouttes <lasgouttes@lyx.org>
Date: Mon, 18 Sep 2017 09:21:18 +0000 (+0200)
Subject: Do not presume what the defaults for a new QPainter are
X-Git-Tag: 2.3.1~133^2~88^2~12
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=7b99bf6a375e14882713d96338345d130cab1425;p=features.git

Do not presume what the defaults for a new QPainter are

(cherry picked from commit 275d306c73e3e0f60e0742adbcb06cce98c48ee5)
---

diff --git a/src/frontends/qt4/GuiPainter.cpp b/src/frontends/qt4/GuiPainter.cpp
index bff8f9dc30..b03bb44ad3 100644
--- a/src/frontends/qt4/GuiPainter.cpp
+++ b/src/frontends/qt4/GuiPainter.cpp
@@ -52,10 +52,10 @@ GuiPainter::GuiPainter(QPaintDevice * device, double pixel_ratio)
 	: QPainter(device), Painter(pixel_ratio),
 	  use_pixmap_cache_(false)
 {
-	// new QPainter has default QPen:
-	current_color_ = guiApp->colorCache().get(Color_black);
-	current_ls_ = line_solid;
-	current_lw_ = thin_line;
+	// set cache correctly
+	current_color_ = pen().color();
+	current_ls_ = pen().style() == Qt::DotLine ? line_onoffdash : line_solid;
+	current_lw_ = pen().width();
 }