parent
526e4343a1
commit
5cc38d594c
|
|
@ -810,7 +810,7 @@ type TCustomMemo = class(TCustomScrollControl,TCustomMemoCmd) //
|
|||
function PluginsAfterPaint(cvs,rcDraw,FirstLine,LastLine);
|
||||
begin
|
||||
end
|
||||
function PaintTextLines(RC,FirstLine,LastLine,FirstCol,LastCol);virtual;
|
||||
function PaintTextLines(RC,FirstLine,LastLine,FirstCol,LastCol);//virtual;
|
||||
begin
|
||||
cvs := Canvas;
|
||||
iy := 0;
|
||||
|
|
@ -831,8 +831,11 @@ type TCustomMemo = class(TCustomScrollControl,TCustomMemoCmd) //
|
|||
r[3]:= r[1]+fTextHeight;
|
||||
if i+1=fCaretY then
|
||||
begin
|
||||
cvs.Brush.Color := fcurrentLineColor;//rgb(232,232,255);
|
||||
cvs.FillRect(r);
|
||||
if Color<>fcurrentLineColor then
|
||||
begin
|
||||
cvs.Brush.Color := fcurrentLineColor;//rgb(232,232,255);
|
||||
cvs.FillRect(r);
|
||||
end
|
||||
end
|
||||
if bb then
|
||||
begin
|
||||
|
|
@ -864,7 +867,7 @@ type TCustomMemo = class(TCustomScrollControl,TCustomMemoCmd) //
|
|||
end
|
||||
end
|
||||
end
|
||||
PaintLiensText(RC,FirstLine,LastLine,FirstCol,LastCol);
|
||||
paintlinestext(RC,FirstLine,LastLine,FirstCol,LastCol);
|
||||
end
|
||||
function DrawLongString(cvs,dtx,tl,r,rnzf);
|
||||
begin
|
||||
|
|
@ -909,7 +912,7 @@ type TCustomMemo = class(TCustomScrollControl,TCustomMemoCmd) //
|
|||
ft.charset := bn;
|
||||
end
|
||||
end
|
||||
function PaintLiensText(RC,FirstLine,LastLine,FirstCol,LastCol);virtual;
|
||||
function paintlinestext(RC,FirstLine,LastLine,FirstCol,LastCol);virtual;
|
||||
begin
|
||||
cvs := canvas;
|
||||
cvs.font := font;
|
||||
|
|
@ -3690,7 +3693,7 @@ type TSynCustomMemo = class(TCustomMemo)
|
|||
end
|
||||
inherited;
|
||||
end
|
||||
function PaintLiensText(RC, FirstLine, LastLine, FirstCol, LastCol); override;
|
||||
function paintlinestext(RC, FirstLine, LastLine, FirstCol, LastCol); override;
|
||||
begin
|
||||
if not Highlighter then return inherited;
|
||||
cvs := canvas;
|
||||
|
|
@ -3703,30 +3706,29 @@ type TSynCustomMemo = class(TCustomMemo)
|
|||
ee := BlockEnd;
|
||||
if ifarray(bb) and ifarray(ee) and bb[0]=ee[0] and bb[1]<ee[1] then
|
||||
begin
|
||||
selt := SelText;
|
||||
selbx := bb[1];
|
||||
selby := bb[0];
|
||||
selt := SelText;
|
||||
selbx := bb[1];
|
||||
selby := bb[0];
|
||||
end
|
||||
if selt then
|
||||
begin
|
||||
selt := lowercase(selt);
|
||||
tks := Highlighter.GetLineTokens(selby-1);
|
||||
for i,v in tks do
|
||||
begin
|
||||
if v.FPos=selbx then
|
||||
for i,v in tks do
|
||||
begin
|
||||
seltcj := v.FMate;
|
||||
break;
|
||||
if v.FPos=selbx then
|
||||
begin
|
||||
seltcj := v.FMate;
|
||||
break;
|
||||
end
|
||||
end
|
||||
IF seltcj then
|
||||
begin
|
||||
Selt := 0;
|
||||
end
|
||||
end
|
||||
IF seltcj then
|
||||
begin
|
||||
Selt := 0;
|
||||
end
|
||||
end
|
||||
crect := ClientRect;
|
||||
//crect := ClientRect;
|
||||
rnzf := integer(crect[2]/cw)+20;
|
||||
rnzf := integer(crect[2]/cw)+20;
|
||||
//***************************************************************************************
|
||||
for i := FirstLine to LastLine do
|
||||
begin
|
||||
|
|
|
|||
Loading…
Reference in New Issue