GitHub-Mirror/x2cl
1
0
Fork 0
mirror of synced 2024-11-23 10:33:51 +00:00
Code Issues Projects Releases Wiki Activity

Added support for BeforeDraw/AfterDraw to GraphicContainerItem

Browse Source
This commit is contained in:
Mark van Renswoude 2019-02-04 13:02:56 +01:00
parent d69c8eb0c8
commit b2fb171e96
1 changed files with 69 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
Source/X2CLGraphicList.pas
View File

@ -30,8 +30,9 @@ uses
type type
// Forward declarations // Forward declarations
TX2GraphicList = class; TX2GraphicList = class;
TX2GraphicContainer = class; TX2GraphicContainer = class;
TX2GraphicContainerItem = class;
TX2GLCustomDrawImageProc = function(ACanvas: TCanvas; TX2GLCustomDrawImageProc = function(ACanvas: TCanvas;
@ -40,6 +41,15 @@ type
AX, AY: Integer; AX, AY: Integer;
AEnabled: Boolean): Boolean; AEnabled: Boolean): Boolean;
TX2GLOnBeforeDrawItem = procedure(Sender: TX2GraphicContainer; ACanvas: TCanvas; AItem: TX2GraphicContainerItem; ABounds: TRect; AEnabled: Boolean; var ADone: Boolean) of object;
TX2GLOnAfterDrawItem = procedure(Sender: TX2GraphicContainer; ACanvas: TCanvas; AItem: TX2GraphicContainerItem; ABounds: TRect; AEnabled: Boolean) of object;
{$IF CompilerVersion >= 23}
TX2GLBeforeDrawProc = reference to procedure(Sender: TX2GraphicContainer; ACanvas: TCanvas; AItem: TX2GraphicContainerItem; ABounds: TRect; AEnabled: Boolean; var ADone: Boolean);
TX2GLAfterDrawProc = reference to procedure(Sender: TX2GraphicContainer; ACanvas: TCanvas; AItem: TX2GraphicContainerItem; ABounds: TRect; AEnabled: Boolean);
{$IFEND}
{ {
:$ Holds a single graphic. :$ Holds a single graphic.
} }
@ -48,6 +58,12 @@ type
FContainer: TX2GraphicContainer; FContainer: TX2GraphicContainer;
FPicture: TPicture; FPicture: TPicture;
FPictureName: String; FPictureName: String;
FOnBeforeDraw: TX2GLOnBeforeDrawItem;
FOnAfterDraw: TX2GLOnAfterDrawItem;
{$IF CompilerVersion >= 23}
FBeforeDrawProc: TX2GLBeforeDrawProc;
FAfterDrawProc: TX2GLAfterDrawProc;
{$IFEND}
function GetIndex: Integer; function GetIndex: Integer;
procedure SetContainer(const Value: TX2GraphicContainer); procedure SetContainer(const Value: TX2GraphicContainer);
@ -67,6 +83,9 @@ type
procedure SetParentComponent(AParent: TComponent); override; procedure SetParentComponent(AParent: TComponent); override;
procedure Notification(AComponent: TComponent; Operation: TOperation); override; procedure Notification(AComponent: TComponent; Operation: TOperation); override;
procedure DoBeforeDraw(Sender: TX2GraphicContainer; ACanvas: TCanvas; ABounds: TRect; AEnabled: Boolean; var ADone: Boolean);
procedure DoAfterDraw(Sender: TX2GraphicContainer; ACanvas: TCanvas; ABounds: TRect; AEnabled: Boolean);
public public
constructor Create(AOwner: TComponent); override; constructor Create(AOwner: TComponent); override;
destructor Destroy; override; destructor Destroy; override;
@ -76,11 +95,18 @@ type
procedure AssignTo(Dest: TPersistent); override; procedure AssignTo(Dest: TPersistent); override;
public public
property Container: TX2GraphicContainer read FContainer write SetContainer stored False; property Container: TX2GraphicContainer read FContainer write SetContainer stored False;
property Index: Integer read GetIndex write SetIndex stored False; property Index: Integer read GetIndex write SetIndex stored False;
{$IF CompilerVersion >= 23}
property BeforeDrawProc: TX2GLBeforeDrawProc read FBeforeDrawProc write FBeforeDrawProc;
property AfterDrawProc: TX2GLAfterDrawProc read FAfterDrawProc write FAfterDrawProc;
{$IFEND}
published published
property Picture: TPicture read FPicture write SetPicture; property Picture: TPicture read FPicture write SetPicture;
property PictureName: String read FPictureName write SetPictureName; property PictureName: String read FPictureName write SetPictureName;
property OnBeforeDraw: TX2GLOnBeforeDrawItem read FOnBeforeDraw write FOnBeforeDraw;
property OnAfterDraw: TX2GLOnAfterDrawItem read FOnAfterDraw write FOnAfterDraw;
end; end;
{ {
@ -342,6 +368,30 @@ begin
end; end;
procedure TX2GraphicContainerItem.DoBeforeDraw(Sender: TX2GraphicContainer; ACanvas: TCanvas; ABounds: TRect; AEnabled: Boolean; var ADone: Boolean);
begin
{$IF CompilerVersion >= 23}
if Assigned(FBeforeDrawProc) then
FBeforeDrawProc(Sender, ACanvas, Self, ABounds, AEnabled, ADone);
{$IFEND}
if Assigned(FOnBeforeDraw) then
FOnBeforeDraw(Sender, ACanvas, Self, ABounds, AEnabled, ADone);
end;
procedure TX2GraphicContainerItem.DoAfterDraw(Sender: TX2GraphicContainer; ACanvas: TCanvas; ABounds: TRect; AEnabled: Boolean);
begin
{$IF CompilerVersion >= 23}
if Assigned(FAfterDrawProc) then
FAfterDrawProc(Sender, ACanvas, Self, ABounds, AEnabled);
{$IFEND}
if Assigned(FOnAfterDraw) then
FOnAfterDraw(Sender, ACanvas, Self, ABounds, AEnabled);
end;
procedure TX2GraphicContainerItem.InternalSetContainer(const AContainer: TX2GraphicContainer); procedure TX2GraphicContainerItem.InternalSetContainer(const AContainer: TX2GraphicContainer);
begin begin
if AContainer <> FContainer then if AContainer <> FContainer then
@ -980,6 +1030,8 @@ var
iY: Integer; iY: Integer;
pBackground: PRGBTripleArray; pBackground: PRGBTripleArray;
pBlend: PRGBTripleArray; pBlend: PRGBTripleArray;
bounds: TRect;
done: Boolean;
begin begin
Result := False; Result := False;
@ -995,6 +1047,16 @@ begin
exit; exit;
{ First see if any custom draw handlers want to draw the image } { First see if any custom draw handlers want to draw the image }
bounds := Rect(AX, AY, AX + Self.Width, AY + Self.Height);
done := False;
FContainer.Graphics[AIndex].DoBeforeDraw(FContainer, ACanvas, bounds, AEnabled, done);
if done then
begin
Result := True;
Exit;
end;
if not CustomDrawImage(ACanvas, Self, AIndex, AX, AY, AEnabled) then if not CustomDrawImage(ACanvas, Self, AIndex, AX, AY, AEnabled) then
begin begin
if AEnabled then if AEnabled then
@ -1050,6 +1112,7 @@ begin
end; end;
end; end;
FContainer.Graphics[AIndex].DoAfterDraw(FContainer, ACanvas, bounds, AEnabled);
Result := True; Result := True;
end; end;