From 915a923604940f58c3fd352de604a4784f1e2121 Mon Sep 17 00:00:00 2001 From: maxim Date: Sat, 6 Jan 2018 13:15:45 +0000 Subject: [PATCH] Merged revision(s) 55934 #2cf9b0d547 from trunk: LCL: fixed incosistency in pen when using TLogPen and TExtLogPen. issue #32465 ........ git-svn-id: branches/fixes_1_8@56984 - --- lcl/include/pen.inc | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lcl/include/pen.inc b/lcl/include/pen.inc index 1e8e333609..8d8b0c8fa7 100644 --- a/lcl/include/pen.inc +++ b/lcl/include/pen.inc @@ -389,10 +389,18 @@ begin if IsGeometric then elpWidth := Width else - //(https://msdn.microsoft.com/en-us/library/windows/desktop/dd162705(v=vs.85).aspx - //https://msdn.microsoft.com/en-us/library/windows/desktop/dd162711(v=vs.85).aspx - //Issue #0022646 - elpWidth := 1; + begin + // issue #32465, regression from fixing #22646. Pure cosmetic + // pen is created via TLogPen, not via TExtLogPen + if ((elpPenStyle and PS_STYLE_MASK) = elpPenStyle) and + (elpPenStyle <> PS_USERSTYLE) then + elpWidth := 0 + else + //(https://msdn.microsoft.com/en-us/library/windows/desktop/dd162705(v=vs.85).aspx + //https://msdn.microsoft.com/en-us/library/windows/desktop/dd162711(v=vs.85).aspx + //Issue #0022646 + elpWidth := 1; + end; elpBrushStyle := BS_SOLID; elpColor := TColorRef(FColor); end;