paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-20 13:19:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

lcl: apply patch of Anton Kavalenka to fix default implementation of CreateRoundRectRGN (issue #0018126)

Browse Source 
git-svn-id: trunk@29850 -
This commit is contained in:
paul 2011-03-15 04:39:03 +00:00
parent cbb791a543
commit 3fdc3e30c6
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lcl/include/intfbasewinapi.inc
View File

@ -198,19 +198,23 @@ end;
function TWidgetSet.CreateRoundRectRgn(X1, Y1, X2, Y2, nWidthEllipse, nHeightEllipse: Integer): HRGN; function TWidgetSet.CreateRoundRectRgn(X1, Y1, X2, Y2, nWidthEllipse, nHeightEllipse: Integer): HRGN;
var var
RoundRgn, CornerSquareRgn, CornerCutRgn: HRGN; RoundRgn, CornerSquareRgn, CornerCutRgn: HRGN;
nHalfX,nHalfY:integer;
begin begin
Result := 0; Result := 0;
// The resulting region // The resulting region
Result := CreateRectRgn(X1, Y1, X2, Y2); Result := CreateRectRgn(X1, Y1, X2, Y2);
nHalfX := nWidthEllipse div 2;
nHalfY := nHeightEllipse div 2;
// We create this region with dummy values just because // We create this region with dummy values just because
// CombineRgn requires an existing region to receive the result // CombineRgn requires an existing region to receive the result
CornerCutRgn := CreateRectRgn(0, 0, nWidthEllipse, nHeightEllipse); CornerCutRgn := CreateRectRgn(0, 0, nWidthEllipse, nHeightEllipse);
// Top-left corner // Top-left corner
RoundRgn := CreateEllipticRgn(X1, Y1, X1 + nWidthEllipse * 2, Y1 + nHeightEllipse * 2); RoundRgn := CreateEllipticRgn(X1, Y1, X1 + nWidthEllipse, Y1 + nHeightEllipse);
CornerSquareRgn := CreateRectRgn(X1, Y1, X1 + nWidthEllipse, Y1 + nHeightEllipse); CornerSquareRgn := CreateRectRgn(X1, Y1, X1 + nHalfX, Y1 + nHalfY);
CombineRgn(CornerCutRgn, RoundRgn, CornerSquareRgn, RGN_AND); CombineRgn(CornerCutRgn, RoundRgn, CornerSquareRgn, RGN_AND);
CombineRgn(CornerCutRgn, CornerSquareRgn, CornerCutRgn, RGN_DIFF); CombineRgn(CornerCutRgn, CornerSquareRgn, CornerCutRgn, RGN_DIFF);
CombineRgn(Result, Result, CornerCutRgn, RGN_DIFF); CombineRgn(Result, Result, CornerCutRgn, RGN_DIFF);
@ -218,8 +222,8 @@ begin
DeleteObject(CornerSquareRgn); DeleteObject(CornerSquareRgn);
// Bottom-left corner // Bottom-left corner
RoundRgn := CreateEllipticRgn(X1, Y2 - nHeightEllipse * 2, X1 + nWidthEllipse * 2, Y2); RoundRgn := CreateEllipticRgn(X1, Y2 - nHeightEllipse, X1 + nWidthEllipse, Y2);
CornerSquareRgn := CreateRectRgn(X1, Y2 - nHeightEllipse, X1 + nWidthEllipse, Y2); CornerSquareRgn := CreateRectRgn(X1, Y2 - nHalfX, X1 + nHalfY, Y2);
CombineRgn(CornerCutRgn, RoundRgn, CornerSquareRgn, RGN_AND); CombineRgn(CornerCutRgn, RoundRgn, CornerSquareRgn, RGN_AND);
CombineRgn(CornerCutRgn, CornerSquareRgn, CornerCutRgn, RGN_DIFF); CombineRgn(CornerCutRgn, CornerSquareRgn, CornerCutRgn, RGN_DIFF);
CombineRgn(Result, Result, CornerCutRgn, RGN_DIFF); CombineRgn(Result, Result, CornerCutRgn, RGN_DIFF);
@ -227,8 +231,8 @@ begin
DeleteObject(CornerSquareRgn); DeleteObject(CornerSquareRgn);
// Top-Right corner // Top-Right corner
RoundRgn := CreateEllipticRgn(X2 - nWidthEllipse * 2 , Y1, X2, Y1 + nHeightEllipse * 2); RoundRgn := CreateEllipticRgn(X2 - nWidthEllipse, Y1, X2, Y1 + nHeightEllipse);
CornerSquareRgn := CreateRectRgn(X2 - nWidthEllipse, Y1, X2, Y1 + nHeightEllipse); CornerSquareRgn := CreateRectRgn(X2 - nHalfX, Y1, X2, Y1 + nHalfY);
CombineRgn(CornerCutRgn, RoundRgn, CornerSquareRgn, RGN_AND); CombineRgn(CornerCutRgn, RoundRgn, CornerSquareRgn, RGN_AND);
CombineRgn(CornerCutRgn, CornerSquareRgn, CornerCutRgn, RGN_DIFF); CombineRgn(CornerCutRgn, CornerSquareRgn, CornerCutRgn, RGN_DIFF);
CombineRgn(Result, Result, CornerCutRgn, RGN_DIFF); CombineRgn(Result, Result, CornerCutRgn, RGN_DIFF);
@ -236,8 +240,8 @@ begin
DeleteObject(CornerSquareRgn); DeleteObject(CornerSquareRgn);
// Bottom-Right corner // Bottom-Right corner
RoundRgn := CreateEllipticRgn(X2 - nWidthEllipse * 2, Y2 - nHeightEllipse * 2, X2, Y2); RoundRgn := CreateEllipticRgn(X2 - nWidthEllipse, Y2 - nHeightEllipse, X2, Y2);
CornerSquareRgn := CreateRectRgn(X2 - nWidthEllipse, Y2 - nHeightEllipse, X2, Y2); CornerSquareRgn := CreateRectRgn(X2 - nHalfX, Y2 - nHalfY, X2, Y2);
CombineRgn(CornerCutRgn, RoundRgn, CornerSquareRgn, RGN_AND); CombineRgn(CornerCutRgn, RoundRgn, CornerSquareRgn, RGN_AND);
CombineRgn(CornerCutRgn, CornerSquareRgn, CornerCutRgn, RGN_DIFF); CombineRgn(CornerCutRgn, CornerSquareRgn, CornerCutRgn, RGN_DIFF);
CombineRgn(Result, Result, CornerCutRgn, RGN_DIFF); CombineRgn(Result, Result, CornerCutRgn, RGN_DIFF);