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

ensuecursorvisible now tries to also show the selection

Browse Source 
git-svn-id: trunk@2627 -
This commit is contained in:
mattias 2002-08-17 23:41:32 +00:00
parent 8680a37625
commit 820460bb3a
1 changed files with 42 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
components/synedit/synedit.pp
View File

@ -1430,7 +1430,7 @@ var
P: PChar; P: PChar;
begin begin
{$IFDEF SYN_LAZARUS} {$IFDEF SYN_LAZARUS}
sLineBreak:=AdjustLineBreaks(#$0D#$0A); sLineBreak:=AdjustLineBreaks(#13#10);
{$ENDIF} {$ENDIF}
if not SelAvail then if not SelAvail then
Result := '' Result := ''
@ -5452,18 +5452,59 @@ end;
procedure TCustomSynEdit.EnsureCursorPosVisible; procedure TCustomSynEdit.EnsureCursorPosVisible;
var var
PhysCaretXY: TPoint; PhysCaretXY: TPoint;
{$IFDEF SYN_LAZARUS}
MinX: Integer;
MaxX: Integer;
PhysBlockBeginXY: TPoint;
PhysBlockEndXY: TPoint;
{$ENDIF}
begin begin
IncPaintLock; IncPaintLock;
try try
// Make sure X is visible // Make sure X is visible
//writeln('[TCustomSynEdit.EnsureCursorPosVisible] A CaretX=',CaretX,' LeftChar=',LeftChar,' CharsInWindow=',CharsInWindow,' ClientWidth=',ClientWidth); //writeln('[TCustomSynEdit.EnsureCursorPosVisible] A CaretX=',CaretX,' LeftChar=',LeftChar,' CharsInWindow=',CharsInWindow,' ClientWidth=',ClientWidth);
PhysCaretXY:=LogicalToPhysicalPos(CaretXY); PhysCaretXY:=LogicalToPhysicalPos(CaretXY);
{$IFDEF SYN_LAZARUS}
// try also to make the current selection visible
MinX:=PhysCaretXY.X;
MaxX:=PhysCaretXY.X;
PhysBlockBeginXY:=LogicalToPhysicalPos(BlockBegin);
PhysBlockEndXY:=LogicalToPhysicalPos(BlockEnd);
if (PhysBlockBeginXY.X<>PhysBlockEndXY.X)
or (PhysBlockBeginXY.Y<>PhysBlockEndXY.Y) then begin
if (SelectionMode<>smColumn) and (PhysBlockBeginXY.Y<>PhysBlockEndXY.Y) then
PhysBlockBeginXY.X:=1;
if MinX>PhysBlockBeginXY.X then
MinX:=Max(PhysBlockBeginXY.X,PhysCaretXY.X-CharsInWindow+1);
if MinX>PhysBlockEndXY.X then
MinX:=Max(PhysBlockEndXY.X,PhysCaretXY.X-CharsInWindow+1);
if MaxX<PhysBlockBeginXY.X then
MaxX:=Min(PhysBlockBeginXY.X,MinX+CharsInWindow-1);
if MaxX<PhysBlockEndXY.X then
MaxX:=Min(PhysBlockEndXY.X,MinX+CharsInWindow-1);
end;
{writeln('TCustomSynEdit.EnsureCursorPosVisible A CaretX=',PhysCaretXY.X,
' BlockX=',PhysBlockBeginXY.X,'-',PhysBlockEndXY.X,
' ChrInWnd=',CharsInWindow,
' MinX=',MinX,
' MaxX=',MaxX,
' LeftChar=',LeftChar,
'');}
if MinX < LeftChar then
LeftChar := MinX
else if LeftChar < MaxX - (CharsInWindow - 1) then
LeftChar := MaxX - (CharsInWindow - 1)
else
LeftChar := LeftChar; //mh 2000-10-19
//writeln('TCustomSynEdit.EnsureCursorPosVisible B LeftChar=',LeftChar);
{$ELSE}
if PhysCaretXY.X < LeftChar then if PhysCaretXY.X < LeftChar then
LeftChar := PhysCaretXY.X LeftChar := PhysCaretXY.X
else if PhysCaretXY.X > CharsInWindow + LeftChar then else if PhysCaretXY.X > CharsInWindow + LeftChar then
LeftChar := PhysCaretXY.X - CharsInWindow + 1 LeftChar := PhysCaretXY.X - CharsInWindow + 1
else else
LeftChar := LeftChar; //mh 2000-10-19 LeftChar := LeftChar; //mh 2000-10-19
{$ENDIF}
// Make sure Y is visible // Make sure Y is visible
if CaretY < TopLine then if CaretY < TopLine then
TopLine := CaretY TopLine := CaretY