paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-31 17:01:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

fpvectorial: Minor changes

Browse Source 
git-svn-id: trunk@51964 -
This commit is contained in:
sekelsenmat 2016-03-16 20:41:16 +00:00
parent a5e03310ce
commit 7ee06844a2
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
components/fpvectorial/fpvectorial.pas
View File

@ -441,11 +441,15 @@ type
TvFindEntityResult = (vfrNotFound, vfrFound, vfrSubpartFound); TvFindEntityResult = (vfrNotFound, vfrFound, vfrSubpartFound);
TvRenderInfo = record TvRenderInfo = record
// Input to the rendering // Input to the rendering, provided by the Document or some other
// top-level entity and propagated down to all sub-entities
BackgroundColor: TFPColor; BackgroundColor: TFPColor;
AdjustPenColorToBackground: Boolean; AdjustPenColorToBackground: Boolean;
Selected: Boolean; Selected: TvEntity;
// Input to the rendering, other inputs
ForceRenderBlock: Boolean; // Blocks are usually invisible, but when rendering an insert, their drawing can be forced ForceRenderBlock: Boolean; // Blocks are usually invisible, but when rendering an insert, their drawing can be forced
// Fields which are output from the rendering process // Fields which are output from the rendering process
EntityCanvasMinXY, EntityCanvasMaxXY: TPoint; // The size utilized in the canvas to draw this entity, in pixels EntityCanvasMinXY, EntityCanvasMaxXY: TPoint; // The size utilized in the canvas to draw this entity, in pixels
end; end;
@ -2542,6 +2546,8 @@ end;
procedure TvEmbeddedVectorialDoc.CalculateBoundingBox(ADest: TFPCustomCanvas; procedure TvEmbeddedVectorialDoc.CalculateBoundingBox(ADest: TFPCustomCanvas;
out ALeft, ATop, ARight, ABottom: Double); out ALeft, ATop, ARight, ABottom: Double);
begin begin
if (Document.Width = 0) or (Document.Height = 0) then
Document.GuessDocumentSize();
ALeft := X; ALeft := X;
ATop := Y; ATop := Y;
ARight := X + Document.Width; ARight := X + Document.Width;
@ -3519,11 +3525,14 @@ end;
class procedure TvEntity.InitializeRenderInfo(out ARenderInfo: TvRenderInfo); class procedure TvEntity.InitializeRenderInfo(out ARenderInfo: TvRenderInfo);
begin begin
// Don't change these because otherwise we lose the value set by the page
// See CopyAndInitDocumentRenderInfo
// ARenderInfo.BackgroundColor := colBlack;
// ARenderInfo.AdjustPenColorToBackground := True;
// ARenderInfo.Selected := nil;
ARenderInfo.EntityCanvasMinXY := Point(INVALID_RENDERINFO_CANVAS_XY, INVALID_RENDERINFO_CANVAS_XY); ARenderInfo.EntityCanvasMinXY := Point(INVALID_RENDERINFO_CANVAS_XY, INVALID_RENDERINFO_CANVAS_XY);
ARenderInfo.EntityCanvasMaxXY := Point(INVALID_RENDERINFO_CANVAS_XY, INVALID_RENDERINFO_CANVAS_XY); ARenderInfo.EntityCanvasMaxXY := Point(INVALID_RENDERINFO_CANVAS_XY, INVALID_RENDERINFO_CANVAS_XY);
//ARenderInfo.BackgroundColor := colBlack; Don't change this because otherwise we lose the value set by the page
//ARenderInfo.AdjustPenColorToBackground := True; dto.
ARenderInfo.Selected := False;
ARenderInfo.ForceRenderBlock := False; ARenderInfo.ForceRenderBlock := False;
end; end;
@ -3533,6 +3542,7 @@ begin
InitializeRenderInfo(ATo); InitializeRenderInfo(ATo);
ATo.AdjustPenColorToBackground := AFrom.AdjustPenColorToBackground; ATo.AdjustPenColorToBackground := AFrom.AdjustPenColorToBackground;
ATo.BackgroundColor := AFrom.BackgroundColor; ATo.BackgroundColor := AFrom.BackgroundColor;
ATo.Selected := AFrom.Selected;
end; end;
function TvEntity.CentralizeY_InHeight(ADest: TFPCustomCanvas; AHeight: Double): Double; function TvEntity.CentralizeY_InHeight(ADest: TFPCustomCanvas; AHeight: Double): Double;