From b7db927ade5d0492fdba93fb3bb3f700a4f5eb0b Mon Sep 17 00:00:00 2001 From: juha Date: Sat, 19 Aug 2017 16:03:31 +0000 Subject: [PATCH] LCL: Calc TCoolBar's aRowEnd also when BandBorderStyle <> bsSingle. Issue #32278, patch from Andrey Zubarev. git-svn-id: trunk@55702 - --- lcl/include/coolbar.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lcl/include/coolbar.inc b/lcl/include/coolbar.inc index 2adb6c9cf7..f0c6f7c47b 100644 --- a/lcl/include/coolbar.inc +++ b/lcl/include/coolbar.inc @@ -1305,14 +1305,14 @@ begin Canvas.Brush.Style := bsClear; Canvas.TextOut(aRect.Left, aRect.Top, FVisiBands[i].Text); end; + if not FRightToLeft or Vertical then + aRowEnd := IsRowEnd(aLeft, i) + else + aRowEnd := IsRowEnd(Width-x, i); if BandBorderStyle = bsSingle then begin //paint a Separator border below the row of bands ____ x := aLeft; inc(aLeft, FVisiBands[i].Width); - if not FRightToLeft or Vertical then - aRowEnd := IsRowEnd(aLeft, i) - else - aRowEnd := IsRowEnd(Width-x, i); if (aRowEnd or ((i = aCountM1) and not AutoSize)) then begin if not Vertical or not FRightToLeft then PaintSeparator(aTop+FVisiBands[i].FHeight)