forks
/
dexed
mirror of https://gitlab.com/basile.b/dexed.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix, upstream regression, debug gutter icons mostly broken

This commit is contained in:
Basile Burg 2017-07-10 08:50:25 +02:00
parent c43254243d
commit 23b71d0f11
No known key found for this signature in database
GPG Key ID: 1868039F415CB8CF
4 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
icons/other/breaks.png → icons/other/break_reached.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 494 B

After

Width:  |  Height:  |  Size: 494 B

BIN
icons/other/break_set.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 425 B

1
src/ce_editor.pas
View File

@ -58,7 +58,6 @@ type
MenuItem10: TMenuItem; MenuItem10: TMenuItem;
MenuItem11: TMenuItem; MenuItem11: TMenuItem;
MenuItem12: TMenuItem; MenuItem12: TMenuItem;
MenuItem13: TMenuItem;
MenuItem14: TMenuItem; MenuItem14: TMenuItem;
mnuedPrevWarn: TMenuItem; mnuedPrevWarn: TMenuItem;
mnuedNextWarn: TMenuItem; mnuedNextWarn: TMenuItem;

35
src/ce_synmemo.pas
View File

@ -140,17 +140,16 @@ type
TSortDialog = class; TSortDialog = class;
TGutterIcon = ( TGutterIcon = (
giBulletRed = 0, // breakpoint giBreakSet = 0, // breakpoint set here
giBulletGreen = 1, giBulletGreen = 1,
giBulletBlack = 2, giBulletBlack = 2,
giBreak = 3, // break point reached giBreakReached= 3, // break point reached
giStep = 4, // step / signal / pause giStep = 4, // step / signal / pause
giWatch = 5, // watch point reached giWatch = 5, // watch point reached
giWarn = 6, // Dscanner result with text hint giWarn = 6 // Dscanner result with text hint
giNone = high(byte) //
); );
const debugTimeGutterIcons = [giBreak, giStep, giWatch]; const debugTimeGutterIcons = [giBreakReached, giStep, giWatch];
type type
@ -843,10 +842,10 @@ begin
TextBuffer.AddNotifyHandler(senrUndoRedoAdded, @changeNotify); TextBuffer.AddNotifyHandler(senrUndoRedoAdded, @changeNotify);
fImages := TImageList.Create(self); fImages := TImageList.Create(self);
fImages.AddResourceName(HINSTANCE, 'BULLET_RED'); fImages.AddResourceName(HINSTANCE, 'BREAK_SET');
fImages.AddResourceName(HINSTANCE, 'BULLET_GREEN'); fImages.AddResourceName(HINSTANCE, 'BULLET_GREEN');
fImages.AddResourceName(HINSTANCE, 'BULLET_BLACK'); fImages.AddResourceName(HINSTANCE, 'BULLET_BLACK');
fImages.AddResourceName(HINSTANCE, 'BREAKS'); fImages.AddResourceName(HINSTANCE, 'BREAK_REACHED');
fImages.AddResourceName(HINSTANCE, 'STEP'); fImages.AddResourceName(HINSTANCE, 'STEP');
fImages.AddResourceName(HINSTANCE, 'CAMERA_GO'); fImages.AddResourceName(HINSTANCE, 'CAMERA_GO');
fImages.AddResourceName(HINSTANCE, 'WARNING'); fImages.AddResourceName(HINSTANCE, 'WARNING');
@ -3100,7 +3099,7 @@ procedure TCESynMemo.addBreakPoint(line: integer);
begin begin
if findBreakPoint(line) then if findBreakPoint(line) then
exit; exit;
addGutterIcon(line, giBulletRed); addGutterIcon(line, giBreakSet);
{$PUSH}{$WARNINGS OFF}{$HINTS OFF} {$PUSH}{$WARNINGS OFF}{$HINTS OFF}
fBreakPoints.Add(pointer(line)); fBreakPoints.Add(pointer(line));
{$POP} {$POP}
@ -3112,7 +3111,7 @@ procedure TCESynMemo.removeBreakPoint(line: integer);
begin begin
if not findBreakPoint(line) then if not findBreakPoint(line) then
exit; exit;
removeGutterIcon(line, giBulletRed); removeGutterIcon(line, giBreakSet);
{$PUSH}{$WARNINGS OFF}{$HINTS OFF} {$PUSH}{$WARNINGS OFF}{$HINTS OFF}
fBreakPoints.Remove(pointer(line)); fBreakPoints.Remove(pointer(line));
{$POP} {$POP}
@ -3149,10 +3148,7 @@ var
begin begin
IncPaintLock; IncPaintLock;
for i:= marks.Count-1 downto 0 do for i:= marks.Count-1 downto 0 do
begin Marks.Items[i].Visible := not (TGutterIcon(Marks.Items[i].ImageIndex) in debugTimeGutterIcons);
if TGutterIcon(Marks.Items[i].ImageIndex) in debugTimeGutterIcons then
Marks.Delete(i);
end;
DecPaintLock; DecPaintLock;
end; end;
@ -3178,14 +3174,16 @@ var
m: TSynEditMarkLine; m: TSynEditMarkLine;
n: TSynEditMark; n: TSynEditMark;
i: integer; i: integer;
s: boolean = false;
begin begin
m := Marks.Line[line]; m := Marks.Line[line];
if m.isNotNil then if m.isNotNil then
for i := 0 to m.Count-1 do for i := 0 to m.Count-1 do
if m.Items[i].ImageIndex = longint(value) then begin
exit; s := m.Items[i].ImageIndex = longint(value);
m.Items[i].Visible := s;
if value <> giNone then end;
if not s then
begin begin
n:= TSynEditMark.Create(self); n:= TSynEditMark.Create(self);
n.Line := line; n.Line := line;
@ -3254,8 +3252,9 @@ begin
caretY := line; caretY := line;
EnsureCursorPosVisible; EnsureCursorPosVisible;
removeDebugTimeMarks; removeDebugTimeMarks;
removeDscannerWarnings;
case reason of case reason of
dbBreakPoint: addGutterIcon(line, giBreak); dbBreakPoint: addGutterIcon(line, giBreakReached);
dbStep, dbSignal: addGutterIcon(line, giStep); dbStep, dbSignal: addGutterIcon(line, giStep);
dbWatch: addGutterIcon(line, giWatch); dbWatch: addGutterIcon(line, giWatch);
end; end;