paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LazMapViewer: Save DrawingEngine state in stack.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9713 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2025-03-31 11:46:38 +00:00
parent 310132d9f5
commit 7f043291a1
2 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/lazmapviewer/source/mvde_intfgraphics.pas
View File

@ -694,7 +694,9 @@ procedure TMvIntfGraphicsDrawingEngine.SetBrushColor(AValue: TColor);
begin begin
if FCanvas <> nil then if FCanvas <> nil then
begin begin
FCanvas.Brush.FPColor := TColorToFPColor(AValue); FCanvas.Brush.FPColor := TColorToFPColor(ColorToRGB(AValue));
if AValue = clNone then
FCanvas.Brush.Style := bsClear;
AddAlphaToColors; AddAlphaToColors;
end; end;
end; end;
@ -826,8 +828,8 @@ begin
bmp.Canvas.Brush.Color := maskClr; bmp.Canvas.Brush.Color := maskClr;
bmp.Canvas.FillRect(0, 0, bmp.Width, bmp.Height); bmp.Canvas.FillRect(0, 0, bmp.Width, bmp.Height);
// Draw background of opaque text // Draw background of text
if GetBrushStyle <> bsClear then if (GetBrushStyle <> bsClear) and (Opacity > 0) then
begin begin
savedBrush := GetBrush; savedBrush := GetBrush;
savedPen := GetPen; savedPen := GetPen;

45
components/lazmapviewer/source/mvdrawingengine.pas
View File

@ -44,14 +44,18 @@ type
Color: TColor; Color: TColor;
end; end;
TMvState = record
Brush: TMvBrush;
Font: TMvFont;
Pen: TMvPen;
Opacity: single;
end;
{ TMvCustomDrawingEngine } { TMvCustomDrawingEngine }
TMvCustomDrawingEngine = class(TComponent) TMvCustomDrawingEngine = class(TComponent)
private private
FSavedBrush: TMvBrush; FStateStack: array of TMvState;
FSavedFont: TMvFont;
FSavedOpacity: Single;
FSavedPen: TMvPen;
protected protected
function GetBrushColor: TColor; virtual; abstract; function GetBrushColor: TColor; virtual; abstract;
function GetBrushStyle: TBrushStyle; virtual; abstract; function GetBrushStyle: TBrushStyle; virtual; abstract;
@ -771,19 +775,36 @@ begin
end; end;
procedure TMvCustomDrawingEngine.RestoreState; procedure TMvCustomDrawingEngine.RestoreState;
var
n: integer;
begin begin
SetPen(FSavedPen); n := Length(FStateStack);
SetBrush(FSavedBrush); if n > 0 then
SetFont(FSavedFont); begin
SetOpacity(FSavedOpacity); with FStateStack[n-1] do
begin
SetPen(Pen);
SetBrush(Brush);
SetFont(Font);
SetOpacity(Opacity);
end;
SetLength(FStateStack, n-1);
end;
end; end;
procedure TMvCustomDrawingEngine.StoreState; procedure TMvCustomDrawingEngine.StoreState;
var
n: Integer;
begin begin
FSavedPen := GetPen; n := Length(FStateStack);
FSavedBrush := GetBrush; SetLength(FStateStack, n+1);
FSavedFont := GetFont; with FStateStack[n] do
FSavedOpacity := GetOpacity; begin
Pen := GetPen;
Brush := GetBrush;
Font := GetFont;
Opacity := GetOpacity;
end;
end; end;
procedure TMvCustomDrawingEngine.SetBrush(ABrush: TMvBrush); procedure TMvCustomDrawingEngine.SetBrush(ABrush: TMvBrush);