mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Viewer - random crash with enabled caret under Qt (issue #2265)

Browse source
This commit is contained in:
Alexander Koblov 2025-05-31 01:17:04 +03:00
commit dd657ed8a1
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
components/viewer/viewercontrol.pas
View file

@ -209,6 +209,7 @@ type
FBlockBeg: PtrInt;
FBlockEnd: PtrInt;
FCaretPos: PtrInt;
FCaretPoint: TPoint;
FMouseBlockBeg: PtrInt;
FMouseBlockSide: TCharSide;
FSelecting: Boolean;
@ -682,6 +683,7 @@ begin
if FShowCaret and FCaretVisible then
begin
FCaretPoint.X := -1;
FCaretVisible := not LCLIntf.HideCaret(Handle);
end;
@ -710,6 +712,12 @@ begin
vcmBook: WriteText;
vcmDec,vcmHex : WriteCustom;
end;
if FShowCaret and (FCaretPoint.X > -1) then
begin
LCLIntf.SetCaretPos(FCaretPoint.X, FCaretPoint.Y);
if not FCaretVisible then FCaretVisible:= LCLIntf.ShowCaret(Handle);
end;
end;
procedure TViewerControl.SetViewerMode(Value: TViewerControlMode);
@ -1779,8 +1787,8 @@ var
begin
if FShowCaret and (FCaretPos = LinePos) then
begin
LCLIntf.SetCaretPos(X, Y);
if not FCaretVisible then FCaretVisible:= LCLIntf.ShowCaret(Handle);
FCaretPoint.X:= X;
FCaretPoint.Y:= Y;
end;
end;
@ -2152,8 +2160,8 @@ begin
if FShowCaret and (FCaretPos >= pBegLine) and (FCaretPos <= pEndLine) then
begin
LCLIntf.SetCaretPos(X + Canvas.TextWidth(GetText(StartPos, FCaretPos - pBegLine, 0)), Y);
if not FCaretVisible then FCaretVisible:= LCLIntf.ShowCaret(Handle);
FCaretPoint.Y:= Y;
FCaretPoint.X:= X + Canvas.TextWidth(GetText(StartPos, FCaretPos - pBegLine, 0));
end;
// Out of selection, draw normal
@ -2208,8 +2216,8 @@ begin
if FShowCaret and (FCaretPos >= pBegLine) and (FCaretPos <= pEndLine) then
begin
LCLIntf.SetCaretPos(X + Canvas.TextWidth(Copy(sText, 1, FCustom.StartAscii + (FCaretPos - pBegLine))), Y);
if not FCaretVisible then FCaretVisible:= LCLIntf.ShowCaret(Handle);
FCaretPoint.Y:= Y;
FCaretPoint.X:= X + Canvas.TextWidth(Copy(sText, 1, FCustom.StartAscii + (FCaretPos - pBegLine)));
end;
// Out of selection, draw normal
@ -2307,8 +2315,8 @@ begin
if FShowCaret and (FCaretPos >= pBegLine) and (FCaretPos <= pEndLine) then
begin
LCLIntf.SetCaretPos(X + Canvas.TextWidth(Copy(sText, 1, FCaretPos - pBegLine)), Y);
if not FCaretVisible then FCaretVisible:= LCLIntf.ShowCaret(Handle);
FCaretPoint.Y:= Y;
FCaretPoint.X:= X + Canvas.TextWidth(Copy(sText, 1, FCaretPos - pBegLine));
end;
// Out of selection, draw normal