paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-07 12:18:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Implements LCLIntf.CreateRoundRectRgn purely with other LCL routines, using CreateRectRgn, CreateEllipticRgn and CombineRgn. Also fixes a crash in LCL-Qt

Browse Source 
git-svn-id: trunk@23359 -
This commit is contained in:
sekelsenmat 2010-01-03 14:49:46 +00:00
parent 2826bd7bab
commit 5509fc02c5
4 changed files with 67 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lcl/include/intfbasewinapi.inc
View File

@ -187,6 +187,66 @@ begin
Result := 0;
end;
{
In each of the 4 corners an ellipse will be created which has the expected
nWidthEllipse and nHeightEllipse. Then we need to create a square in the
appropriate corner of the ellipse, according to where it will be placed.
CornerCutRgn = Execute AND between the rectangle and ellipse.
CornerCutRgn = Execute SUB between the CornerCutRgn and the rectangle. (To invert it)
Execute SUB between each r2 and the rectangle and get the final rounded rectangle.
}
function TWidgetSet.CreateRoundRectRgn(X1, Y1, X2, Y2, nWidthEllipse, nHeightEllipse: Integer): HRGN;
var
RoundRgn, CornerSquareRgn, CornerCutRgn: HRGN;
begin
Result := 0;
// The resulting region
Result := CreateRectRgn(X1, Y1, X2, Y2);
// We create this region with dummy values just because
// CombineRgn requires an existing region to receive the result
CornerCutRgn := CreateRectRgn(0, 0, nWidthEllipse, nHeightEllipse);
// Top-left corner
RoundRgn := CreateEllipticRgn(X1, Y1, X1 + nWidthEllipse * 2, Y1 + nHeightEllipse * 2);
CornerSquareRgn := CreateRectRgn(X1, Y1, X1 + nWidthEllipse, Y1 + nHeightEllipse);
CombineRgn(CornerCutRgn, RoundRgn, CornerSquareRgn, RGN_AND);
CombineRgn(CornerCutRgn, CornerSquareRgn, CornerCutRgn, RGN_DIFF);
CombineRgn(Result, Result, CornerCutRgn, RGN_DIFF);
DeleteObject(RoundRgn);
DeleteObject(CornerSquareRgn);
// Bottom-left corner
RoundRgn := CreateEllipticRgn(X1, Y2 - nHeightEllipse * 2, X1 + nWidthEllipse * 2, Y2);
CornerSquareRgn := CreateRectRgn(X1, Y2 - nHeightEllipse, X1 + nWidthEllipse, Y2);
CombineRgn(CornerCutRgn, RoundRgn, CornerSquareRgn, RGN_AND);
CombineRgn(CornerCutRgn, CornerSquareRgn, CornerCutRgn, RGN_DIFF);
CombineRgn(Result, Result, CornerCutRgn, RGN_DIFF);
DeleteObject(RoundRgn);
DeleteObject(CornerSquareRgn);
// Top-Right corner
RoundRgn := CreateEllipticRgn(X2 - nWidthEllipse * 2 , Y1, X2, Y1 + nHeightEllipse * 2);
CornerSquareRgn := CreateRectRgn(X2 - nWidthEllipse, Y1, X2, Y1 + nHeightEllipse);
CombineRgn(CornerCutRgn, RoundRgn, CornerSquareRgn, RGN_AND);
CombineRgn(CornerCutRgn, CornerSquareRgn, CornerCutRgn, RGN_DIFF);
CombineRgn(Result, Result, CornerCutRgn, RGN_DIFF);
DeleteObject(RoundRgn);
DeleteObject(CornerSquareRgn);
// Bottom-Right corner
RoundRgn := CreateEllipticRgn(X2 - nWidthEllipse * 2, Y2 - nHeightEllipse * 2, X2, Y2);
CornerSquareRgn := CreateRectRgn(X2 - nWidthEllipse, Y2 - nHeightEllipse, X2, Y2);
CombineRgn(CornerCutRgn, RoundRgn, CornerSquareRgn, RGN_AND);
CombineRgn(CornerCutRgn, CornerSquareRgn, CornerCutRgn, RGN_DIFF);
CombineRgn(Result, Result, CornerCutRgn, RGN_DIFF);
DeleteObject(RoundRgn);
DeleteObject(CornerSquareRgn);
DeleteObject(CornerCutRgn);
end;
procedure TWidgetSet.DeleteCriticalSection(var CritSection: TCriticalSection);
begin
DebugLn('TWidgetSet.DeleteCriticalSection Not implemented yet');

5
lcl/include/winapi.inc
View File

@ -161,6 +161,11 @@ Begin
Result := WidgetSet.CreateRectRgn(X1,Y1,X2,Y2);
end;
function CreateRoundRectRgn(X1, Y1, X2, Y2, nWidthEllipse, nHeightEllipse: Integer): HRGN;
begin
Result := WidgetSet.CreateRoundRectRgn(X1, Y1, X2, Y2, nWidthEllipse, nHeightEllipse);
end;
procedure DeleteCriticalSection(var CritSection: TCriticalSection);
begin
WidgetSet.DeleteCriticalSection(CritSection);

1
lcl/include/winapih.inc
View File

@ -72,6 +72,7 @@ function CreatePenIndirect(const LogPen: TLogPen): HPEN; {$IFDEF IF_BASE_MEMBER}
function CreatePolygonRgn(Points: PPoint; NumPts: Integer; FillMode: integer): HRGN; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function CreateRectRgn(X1,Y1,X2,Y2 : Integer): HRGN; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
//function CreateRectRgnIndirect --> independent
function CreateRoundRectRgn(X1, Y1, X2, Y2, nWidthEllipse, nHeightEllipse: Integer): HRGN; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
procedure DeleteCriticalSection(var CritSection: TCriticalSection); {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}
function DeleteDC(hDC: HDC): Boolean; {$IFDEF IF_BASE_MEMBER}virtual;{$ENDIF}

5
lcl/interfaces/qt/qtwinapi.inc
View File

@ -4810,15 +4810,12 @@ begin
{$endif}
// Basic checks
if (hWnd = 0) then Exit;
if (hWnd = 0) or (hRgn = 0) then Exit;
w := TQtWidget(hWnd);
r := TQtRegion(hRgn);
// Now set the mask in the widget
w.setMask(r.Widget);
Result := 1;