MG: bugfix for clipping rect

git-svn-id: trunk@301 -
This commit is contained in:
lazarus 2001-06-26 23:24:22 +00:00
parent b8d28a65c6
commit 9df86b0fa9
5 changed files with 22 additions and 7 deletions

View File

@ -1788,7 +1788,11 @@ var
nL1, nL2, nC1, nC2: integer;
begin
// Get the invalidated rect. Compute the invalid area in lines / columns.
{$IFDEF SYN_LAZARUS}
rcClip:=Rect(0,0,Width,Height);
{$ELSE}
rcClip := Canvas.ClipRect;
{$ENDIF}
// columns
nC1 := LeftChar;
if (rcClip.Left > fGutterWidth + 2) then
@ -1993,6 +1997,9 @@ var
end;
dc: HDC;
m1: integer;
{ local procedures }
procedure ComputeSelectionInfo;
@ -2211,6 +2218,7 @@ var
end;
begin
inc(m1);
if Background = clNone then Background := colEditorBG;
if Foreground = clNone then Foreground := Font.Color;
// Do we have to paint the old chars first, or can we just append?
@ -2417,6 +2425,7 @@ var
{ end local procedures }
begin
m1:=0;
colEditorBG := Color;
if Assigned(Highlighter) and Assigned(Highlighter.WhitespaceAttribute) then
begin
@ -4744,6 +4753,9 @@ begin
CaretNew := PrevWordPos;
MoveCaretAndSelection(Caret, CaretNew, Command = ecSelWordLeft);
fLastCaretX := fCaretX; //mh 2000-10-19
{$IFDEF SYN_LAZARUS}
Update;
{$ENDIF}
end;
ecWordRight, ecSelWordRight:
begin
@ -4751,6 +4763,9 @@ begin
CaretNew := NextWordPos;
MoveCaretAndSelection(Caret, CaretNew, Command = ecSelWordRight);
fLastCaretX := fCaretX; //mh 2000-10-19
{$IFDEF SYN_LAZARUS}
Update;
{$ENDIF}
end;
ecSelectAll:
begin

View File

@ -147,7 +147,7 @@ type
function IsKeyword(const AKeyword: string): boolean; virtual; // DJLP 2000-08-09
procedure Next; virtual; abstract;
procedure NextToEol;
procedure SetLine(NewValue: String; LineNumber:Integer); virtual; abstract;
procedure SetLine(const NewValue: String; LineNumber:Integer); virtual; abstract;
procedure SetRange(Value: Pointer); virtual;
procedure ResetRange; virtual;
function UseUserSettings(settingIndex: integer): boolean; virtual;

View File

@ -218,7 +218,7 @@ type
function GetEol: Boolean; override;
function GetRange: Pointer; override;
function GetTokenID: TtkTokenKind;
procedure SetLine(NewValue: String; LineNumber:Integer); override;
procedure SetLine(const NewValue: String; LineNumber:Integer); override;
function GetToken: String; override;
function GetTokenAttribute: TSynHighlighterAttributes; override;
function GetTokenKind: integer; override;
@ -787,7 +787,7 @@ begin
fDefaultFilter := SYNS_FilterCPP;
end; { Create }
procedure TSynCppSyn.SetLine(NewValue: String; LineNumber:Integer);
procedure TSynCppSyn.SetLine(const NewValue: String; LineNumber:Integer);
begin
fLine := PChar(NewValue);
Run := 0;

View File

@ -417,7 +417,7 @@ type
function GetEol: Boolean; override;
function GetRange: Pointer; override;
function GetTokenID: TtkTokenKind;
procedure SetLine(NewValue: string; LineNumber:Integer); override;
procedure SetLine(const NewValue: string; LineNumber:Integer); override;
function GetToken: string; override;
function GetTokenAttribute: TSynHighlighterAttributes; override;
function GetTokenKind: integer; override;
@ -1969,7 +1969,7 @@ begin
fDefaultFilter := SYNS_FilterHTML;
end;
procedure TSynHTMLSyn.SetLine(NewValue: string; LineNumber:Integer);
procedure TSynHTMLSyn.SetLine(const NewValue: string; LineNumber:Integer);
begin
fLine := PChar(NewValue);
Run := 0;

View File

@ -214,7 +214,7 @@ type
function GetTokenPos: Integer; override;
procedure Next; override;
procedure ResetRange; override;
procedure SetLine(NewValue: string; LineNumber:Integer); override;
procedure SetLine({$IFDEF FPC}const {$ENDIF}NewValue: string; LineNumber:Integer); override;
procedure SetRange(Value: Pointer); override;
function UseUserSettings(settingIndex: integer): boolean; override;
procedure EnumUserSettings(settings: TStrings); override;
@ -990,7 +990,7 @@ begin
fDefaultFilter := SYNS_FilterPascal;
end; { Create }
procedure TSynPasSyn.SetLine(NewValue: string; LineNumber:Integer);
procedure TSynPasSyn.SetLine(const NewValue: string; LineNumber:Integer);
begin
fLine := PChar(NewValue);
Run := 0;