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