paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-25 23:39:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Debugger: Assembler view, don't ctrl-jump when clicking gutter for changing breakpoint.

Browse Source 
(cherry picked from commit 27d50a74a8)
This commit is contained in:
Martin 2023-10-08 13:48:51 +02:00
parent e49d174f17
commit e9bdb9a3a6
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ide/packages/idedebugger/assemblerdlg.pp
View File

@ -127,6 +127,7 @@ type
FCurrentLocation: TDBGPtr; // current view location (lines are relative to this location)
FLocation: TDBGPtr; // the actual PC, green "=>" execution mark
FMouseIsDown: Boolean;
FMouseDownX, FMouseDownY: Integer;
FLinkLine, FTargetLine: integer;
FIsVScrollTrack: Boolean;
FVScrollCounter, FVScrollPos: Integer;
@ -575,6 +576,8 @@ begin
debugln(['TAssemblerDlg.pbAsmClick ',dbgs(p)]);
if P.x > FGutterWidth then exit;
Line := P.Y div FLineHeight;
if FMouseIsDown and (FMouseDownY <> Line) then
exit;
if not (FLineMap[Line].State in [lmsStatement, lmsSource])
then exit;
@ -650,10 +653,13 @@ begin
case Button of
mbLeft: begin
FMouseIsDown := True;
FMouseDownX := X;
FMouseDownY := Y;
if FLinkLine >= 0 then
Invalidate;
FTargetLine := -1;
FLinkLine := -1;
if X <= FGutterWidth then exit;
if not(ssCtrl in Shift) then begin
SetSelection(FTopLine + Y, False, ssShift in Shift);
end
@ -678,13 +684,14 @@ begin
y := Y div FLineHeight;
case FMouseIsDown of
True: begin
if (FLinkLine < 0) and (y >= 0) and (y < FLineCount)
if (FLinkLine < 0) and (y >= 0) and (y < FLineCount) and (FMouseDownX > FGutterWidth)
then SetSelection(FTopLine + Y, False, True);
end;
False: begin
if (ssCtrl in Shift) and
(Y >= 0) and (y <= FLineCount) and
(FLineMap[y].TargetAddr <> 0) and (FDebugger <> nil)
(FLineMap[y].TargetAddr <> 0) and (FDebugger <> nil) and
(X > FGutterWidth)
then begin
if (FLinkLine <> y) then
Invalidate;
@ -709,7 +716,8 @@ begin
if (ssCtrl in Shift) and (FLinkLine = y div FLineHeight) and
(FLinkLine >= 0) and (FLinkLine <= FLineCount) and
(FLineMap[FLinkLine].TargetAddr <> 0) and (FDebugger <> nil)
(FLineMap[FLinkLine].TargetAddr <> 0) and (FDebugger <> nil) and
(X > FGutterWidth) and (FMouseDownX > FGutterWidth)
then begin
SetLocation(FDebugger, FLineMap[FLinkLine].TargetAddr);
end;