paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-18 07:29:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

EditorOptions: added folded block to preview

Browse Source 
git-svn-id: trunk@21178 -
This commit is contained in:
martin 2009-08-11 22:53:25 +00:00
parent 95d59e9124
commit 5d854504eb
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ide/editoroptions.pp
View File

@ -1546,6 +1546,8 @@ begin
' asm'#13 + ' MOV AX,1234h'#13 +
' MOV Number,AX'#13 +
' end;'#13 +
' {%region /fold}'#13 +
' {%endregion}'#13 +
' X := 10;'#13 +
' inc(X); {$R+} { Search Match, Text Block }'#13 +
' for I := 0 to Number do {$R-} { execution point }'#13 +
@ -1558,13 +1560,14 @@ begin
' ListBox1.Items.Add(IntToStr(X));'#13 +
' end;'#13 +
'end;'#13 + #13;
AddAttrSampleLines[ahaDisabledBreakpoint] := 18;
AddAttrSampleLines[ahaEnabledBreakpoint] := 17;
AddAttrSampleLines[ahaInvalidBreakpoint] := 19;
AddAttrSampleLines[ahaUnknownBreakpoint] := 20;
AddAttrSampleLines[ahaErrorLine] := 21;
AddAttrSampleLines[ahaExecutionPoint] := 15;
AddAttrSampleLines[ahaTextBlock] := 14;
AddAttrSampleLines[ahaDisabledBreakpoint] := 20;
AddAttrSampleLines[ahaEnabledBreakpoint] := 19;
AddAttrSampleLines[ahaInvalidBreakpoint] := 21;
AddAttrSampleLines[ahaUnknownBreakpoint] := 22;
AddAttrSampleLines[ahaErrorLine] := 23;
AddAttrSampleLines[ahaExecutionPoint] := 17;
AddAttrSampleLines[ahaTextBlock] := 16;
AddAttrSampleLines[ahaFoldedCode] := 13;
CaretXY := Point(21, 7);
end;
Add(NewInfo);

11
ide/frames/editor_color_options.pas
View File

@ -339,7 +339,12 @@ begin
if CurLanguageID >= 0 then
begin
AddAttr := EditorOpts.HighlighterList[CurLanguageID].SampleLineToAddAttr(XY.Y);
if AddAttr <> ahaNone then
if AddAttr = ahaFoldedCode then begin
if (XY.X >= Length(ColorPreview.Lines[XY.Y-1]) + 4) and
(XY.X <= Length(ColorPreview.Lines[XY.Y-1]) + 7) then
NewNode := ColorElementTree.Items.FindNodeWithText(COLOR_NODE_PREFIX+AdditionalHighlightAttributes[AddAttr]);
end
else if AddAttr <> ahaNone then
NewNode := ColorElementTree.Items.FindNodeWithText(COLOR_NODE_PREFIX+AdditionalHighlightAttributes[AddAttr]);
end;
if (NewNode = nil) and (XY.Y = ColorPreview.CaretY) and
@ -574,6 +579,7 @@ begin
PreviewEdits[a].CaretXY := EditorOpts.HighlighterList[CurLanguageID].CaretXY;
PreviewEdits[a].TopLine := 1;
PreviewEdits[a].LeftChar := 1;
PreviewEdits[a].AfterLoadFromFile;
end;
SetPreviewSynInAllPreviews;
FillColorElementListBox;
@ -1109,6 +1115,7 @@ begin
CaretXY := HighlighterList[CurLanguageID].CaretXY;
TopLine := 1;
LeftChar := 1;
AfterLoadFromFile;
end;
LanguageComboBox.Text := PreviewSyn.LanguageName;
@ -1229,7 +1236,7 @@ begin
if CurLanguageID >= 0 then
begin
AddAttr := EditorOpts.HighlighterList[CurLanguageID].SampleLineToAddAttr(Line);
if AddAttr <> ahaNone then
if (AddAttr <> ahaNone) and (AddAttr <> ahaFoldedCode) then
begin
i := PreviewSyn.AttrCount - 1;
while (i >= 0) do