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

fixed default font

Browse Source 
git-svn-id: trunk@2721 -
This commit is contained in:
mattias 2002-08-18 04:56:58 +00:00
parent 09d5b2c0e1
commit caa329c29e
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lcl/graphics.pp
View File

@ -500,10 +500,6 @@ type
procedure BrushChanged(ABrush: TObject); procedure BrushChanged(ABrush: TObject);
procedure FontChanged(AFont: TObject); procedure FontChanged(AFont: TObject);
procedure RegionChanged(ARegion: TObject); procedure RegionChanged(ARegion: TObject);
procedure CreateBrush;
procedure CreateFont;
Procedure CreatePen;
Procedure CreateRegion;
procedure DeselectHandles; procedure DeselectHandles;
function GetCanvasClipRect: TRect; function GetCanvasClipRect: TRect;
Function GetColor: TColor; Function GetColor: TColor;
@ -521,6 +517,10 @@ type
Procedure SetPixel(X,Y : Integer; Value : TColor); Procedure SetPixel(X,Y : Integer; Value : TColor);
Procedure SetRegion(value : TRegion); Procedure SetRegion(value : TRegion);
protected protected
procedure CreateFont; virtual;
procedure CreateBrush;
Procedure CreatePen;
Procedure CreateRegion;
procedure CreateHandle; virtual; procedure CreateHandle; virtual;
procedure RequiredState(ReqState: TCanvasState); procedure RequiredState(ReqState: TCanvasState);
public public
@ -586,6 +586,7 @@ type
function TextHeight(const Text: string): Integer; function TextHeight(const Text: string): Integer;
function TextWidth(const Text: string): Integer; function TextWidth(const Text: string): Integer;
function HandleAllocated: boolean; function HandleAllocated: boolean;
function GetUpdatedHandle(ReqState: TCanvasState): HDC;
public public
property ClipRect: TRect read GetCanvasClipRect; property ClipRect: TRect read GetCanvasClipRect;
property PenPos: TPoint read GetPenPos write SetPenPos; property PenPos: TPoint read GetPenPos write SetPenPos;
@ -962,6 +963,9 @@ end.
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.66 2003/04/02 13:23:23 mattias
fixed default font
Revision 1.65 2003/03/12 14:39:29 mattias Revision 1.65 2003/03/12 14:39:29 mattias
fixed clipping origin in stretchblt fixed clipping origin in stretchblt

17
lcl/include/canvas.inc
View File

@ -72,7 +72,7 @@ Begin
if Canvas <> nil if Canvas <> nil
then begin then begin
Canvas.RequiredState([csHandleValid, csBrushValid]); Canvas.RequiredState([csHandleValid, csBrushValid]);
RequiredState([csHandleValid, csFontValid, csBrushValid]); RequiredState([csHandleValid, csBrushValid]);
SH := Source.Bottom - Source.Top; SH := Source.Bottom - Source.Top;
SW := Source.Right - Source.Left; SW := Source.Right - Source.Left;
@ -740,11 +740,23 @@ begin
MoveTo(X + TextWidth(Text), Y); MoveTo(X + TextWidth(Text), Y);
end; end;
{------------------------------------------------------------------------------
function TCanvas.HandleAllocated: boolean;
------------------------------------------------------------------------------}
function TCanvas.HandleAllocated: boolean; function TCanvas.HandleAllocated: boolean;
begin begin
Result:=(FHandle<>0); Result:=(FHandle<>0);
end; end;
{------------------------------------------------------------------------------
function TCanvas.GetUpdatedHandle(ReqState: TCanvasState): HDC;
------------------------------------------------------------------------------}
function TCanvas.GetUpdatedHandle(ReqState: TCanvasState): HDC;
begin
RequiredState(ReqState+[csHandleValid]);
Result:=FHandle;
end;
{------------------------------------------------------------------------------ {------------------------------------------------------------------------------
Method: TCanvas.MoveTo Method: TCanvas.MoveTo
Params: X1,Y1 Params: X1,Y1
@ -1157,6 +1169,9 @@ end;
{ ============================================================================= { =============================================================================
$Log$ $Log$
Revision 1.43 2003/04/02 13:23:23 mattias
fixed default font
Revision 1.42 2003/03/12 14:39:29 mattias Revision 1.42 2003/03/12 14:39:29 mattias
fixed clipping origin in stretchblt fixed clipping origin in stretchblt