From e91cd3d9418d24b85c8c17204faaaeffdd2da1df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?= =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= Date: Tue, 3 Oct 2017 14:11:58 +0000 Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@289 a8b55f48-bf90-11e4-a774-851b48703e85 --- qad/graphic/graphic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qad/graphic/graphic.cpp b/qad/graphic/graphic.cpp index 12038e2..6f53f1d 100644 --- a/qad/graphic/graphic.cpp +++ b/qad/graphic/graphic.cpp @@ -870,7 +870,7 @@ void Graphic::drawGrid() { py = start + step; cy = 0; cx = gbx - 5; - grid_pen.setWidth(qMax(qRound(thick / 1.4), 1)); + grid_pen.setWidth(qMax(qMax(qRound(thick / 1.4), 1), grid_pen.width())); QFont sf = font(); QFont nf = sf; sf.setPointSizeF(qMax(sf.pointSizeF() / 1.6, 7.)); @@ -994,7 +994,7 @@ void Graphic::drawGrid() { painter->drawText(gbx, chei - font_sz.height(), wid, font_sz.height(), Qt::AlignCenter, label_x); } - painter->setPen(QPen(grid_pen.color(), thick)); + painter->setPen(QPen(grid_pen.color(), qMax(thick, grid_pen.width()))); painter->drawRect(gbx, -1, wid + 6, hei + 6); }