From c12c24dc34c7058e2386c1eda8f7411fb5841552 Mon Sep 17 00:00:00 2001
From: martin <laz.git@mfriebe.de>
Date: Tue, 30 Apr 2019 22:54:27 +0000
Subject: [PATCH] IDE, EditorOptions: add colors for Overview-Gutter

git-svn-id: trunk@61095 -
---
 ide/ColorDefault.xml                |   1 +
 ide/ColorDelphi.xml                 |   1 +
 ide/ColorOcean.xml                  |   1 +
 ide/ColorPascalClassic.xml          |   1 +
 ide/ColorTwilight.xml               |   1 +
 ide/editoroptions.pp                |  38 ++++++++++++++++++++++++++--
 ide/editoroptions.res               | Bin 66296 -> 65332 bytes
 ide/frames/editor_color_options.pas |  15 ++++++++++-
 ide/lazarusidestrconsts.pas         |   4 +++
 ide/sourcemarks.pas                 |   2 +-
 ide/syncolorattribeditor.pas        |  23 ++++++++++-------
 11 files changed, 74 insertions(+), 13 deletions(-)

diff --git a/ide/ColorDefault.xml b/ide/ColorDefault.xml
index 152c705cf9..0592e14f16 100644
--- a/ide/ColorDefault.xml
+++ b/ide/ColorDefault.xml
@@ -43,6 +43,7 @@
           <ahaGutterSeparator Background="clWhite" Foreground="clGray"/>
           <ahaGutter Background="clBtnFace"/>
           <ahaRightMargin Foreground="clSilver"/>
+          <ahaOverviewGutter Foreground="13948116" Background="15263976" FrameColor="12632256"/>
           <ahaIdentComplWindowHighlight Foreground="187"/>
           <ahaOutlineLevel1Color Foreground="clRed"/>
           <ahaOutlineLevel2Color Foreground="39159"/>
diff --git a/ide/ColorDelphi.xml b/ide/ColorDelphi.xml
index 59e1c062c5..895c907930 100644
--- a/ide/ColorDelphi.xml
+++ b/ide/ColorDelphi.xml
@@ -43,6 +43,7 @@
           <ahaGutterSeparator Background="clWhite" Foreground="clGray"/>
           <ahaGutter Background="clBtnFace"/>
           <ahaRightMargin Foreground="clSilver"/>
+          <ahaOverviewGutter Foreground="13948116" Background="15263976" FrameColor="12632256"/>
           <ahaIdentComplWindowHighlight Foreground="191"/>
           <ahaOutlineLevel1Color Foreground="clRed"/>
           <ahaOutlineLevel2Color Foreground="39159"/>
diff --git a/ide/ColorOcean.xml b/ide/ColorOcean.xml
index 8f4b8de591..5bab6fa751 100644
--- a/ide/ColorOcean.xml
+++ b/ide/ColorOcean.xml
@@ -43,6 +43,7 @@
           <ahaGutterSeparator Background="clWhite" Foreground="clGray"/>
           <ahaGutter Background="clNavy"/>
           <ahaRightMargin Foreground="clSilver"/>
+          <ahaOverviewGutter Foreground="4210752" Background="6579300" FrameColor="clBlue"/>
           <ahaIdentComplWindowHighlight Foreground="clAqua"/>
           <ahaIdentComplWindow Background="8388649"/>
           <ahaOutlineLevel1Color Foreground="clRed"/>
diff --git a/ide/ColorPascalClassic.xml b/ide/ColorPascalClassic.xml
index dc232d3c6c..803f7c5cee 100644
--- a/ide/ColorPascalClassic.xml
+++ b/ide/ColorPascalClassic.xml
@@ -39,6 +39,7 @@
           <ahaIfDefNodeTmpActive  ForePriority="9050" BackPriority="9050" FramePriority="9050"/>
           <ahaModifiedLine Foreground="clGreen" FrameColor="59900"/>
           <ahaRightMargin Foreground="clSilver"/>
+          <ahaOverviewGutter Foreground="4210752" Background="6579300" FrameColor="clBlue"/>
           <ahaCodeFoldingTree Foreground="clSilver"/>
           <ahaGutterSeparator Background="clWhite" Foreground="clGray"/>
           <ahaGutter Background="clNavy"/>
diff --git a/ide/ColorTwilight.xml b/ide/ColorTwilight.xml
index 67e8d36460..0ec99055ef 100644
--- a/ide/ColorTwilight.xml
+++ b/ide/ColorTwilight.xml
@@ -43,6 +43,7 @@
           <ahaGutterSeparator Background="clWhite" Foreground="clGray"/>
           <ahaGutter Background="clBlack"/>
           <ahaRightMargin Foreground="clSilver"/>
+          <ahaOverviewGutter Foreground="4210752" Background="6579300" FrameColor="8947848"/>
           <ahaIdentComplWindow Background="3552822"/>
           <ahaIdentComplWindowBorder Foreground="7039851"/>
           <ahaIdentComplWindowHighlight Foreground="clLime"/>
diff --git a/ide/editoroptions.pp b/ide/editoroptions.pp
index 26a41c853e..f11efcacd3 100644
--- a/ide/editoroptions.pp
+++ b/ide/editoroptions.pp
@@ -62,7 +62,7 @@ uses
   SynHighlighterPython, SynHighlighterUNIXShellScript, SynHighlighterXML,
   SynHighlighterJScript, SynHighlighterDiff, SynHighlighterBat,
   SynHighlighterIni, SynHighlighterPo, SynHighlighterPike, SynPluginMultiCaret,
-  SynEditMarkupFoldColoring, SynEditMarkup,
+  SynEditMarkupFoldColoring, SynEditMarkup, SynGutterLineOverview,
   // codetools
   LinkScanner, CodeToolManager,
   // IDEIntf
@@ -123,7 +123,7 @@ const
     '',  // ahaRightMargin
     '',  // ahaSpecialVisibleChars
     '',  // ahaTopInfoHint
-    '', // ahaCaretColor
+    '', '', // ahaCaretColor, ahaOverviewGutter
     '', '', '',  // ahaIfDefBlockInactive, ahaIfDefBlockActive, ahaIfDefBlockTmpActive
     '', '', '',  // ahaIfDefNodeInactive, ahaIfDefNodeActive, ahaIfDefNodeTmpActive
     '', '', '', '', // ahaIdentComplWindow, ahaIdentComplWindowBorder, ahaIdentComplWindowSelection, ahaIdentComplWindowHighlight
@@ -165,6 +165,7 @@ const
     { ahaSpecialVisibleChars } agnText,
     { ahaTopInfoHint }         agnLine,
     { ahaCaretColor }          agnText,
+    { ahaOverviewGutter }      agnGutter,
     { ahaIfDefBlockInactive }  agnIfDef,
     { ahaIfDefBlockActive }    agnIfDef,
     { ahaIfDefBlockTmpActive } agnIfDef,
@@ -223,6 +224,7 @@ const
     { ahaSpecialVisibleChars }[hafBackColor, hafForeColor, hafFrameColor, hafAlpha, hafPrior, hafFrameStyle, hafFrameEdges, hafStyle, hafStyleMask],
     { ahaTopInfoHint }        [hafBackColor, hafForeColor, hafFrameColor, hafAlpha, hafPrior, hafFrameStyle, hafFrameEdges, hafStyle, hafStyleMask],
     { ahaCaretColor }         [hafBackColor, hafForeColor],
+    { ahaOverviewGutter }     [hafBackColor, hafForeColor, hafFrameColor],
     { ahaIfDefBlockInactive } [hafBackColor, hafForeColor, hafFrameColor, hafAlpha, hafPrior, hafFrameStyle, hafFrameEdges, hafStyle, hafStyleMask],
     { ahaIfDefBlockActive }   [hafBackColor, hafForeColor, hafFrameColor, hafAlpha, hafPrior, hafFrameStyle, hafFrameEdges, hafStyle, hafStyleMask],
     { ahaIfDefBlockTmpActive }[hafBackColor, hafForeColor, hafFrameColor, hafAlpha, hafPrior, hafFrameStyle, hafFrameEdges, hafStyle, hafStyleMask],
@@ -2568,6 +2570,7 @@ begin
   AdditionalHighlightAttributes[ahaSpecialVisibleChars] := dlgAddHiSpecialVisibleChars;
   AdditionalHighlightAttributes[ahaTopInfoHint]         := dlgTopInfoHint;
   AdditionalHighlightAttributes[ahaCaretColor]          := dlgCaretColor;
+  AdditionalHighlightAttributes[ahaOverviewGutter]      := dlgOverviewGutterColor;
   AdditionalHighlightAttributes[ahaIfDefBlockInactive]  := dlgIfDefBlockInactive;
   AdditionalHighlightAttributes[ahaIfDefBlockActive]    := dlgIfDefBlockActive;
   AdditionalHighlightAttributes[ahaIfDefBlockTmpActive] := dlgIfDefBlockTmpActive;
@@ -6704,6 +6707,8 @@ var
   IDESynEdit: TIDESynEditor;
   aha: TAdditionalHilightAttribute;
   col: TColor;
+  OGutter: TSynGutterLineOverview;
+  OGutterProv: TSynGutterLineOverviewProvider;
 begin
   ASynEdit.BeginUpdate;
   try
@@ -6781,6 +6786,35 @@ begin
     SetGutterColorByClass(ahaCodeFoldingTree, TSynGutterCodeFolding);
     SetGutterColorByClass(ahaGutterSeparator, TSynGutterSeparator);
 
+    OGutter := TSynGutterLineOverview(ASynEdit.RightGutter.Parts.ByClass[TSynGutterLineOverview, 0]);
+    if OGutter <> nil then begin
+      for i := 0 to OGutter.Providers.Count - 1 do begin
+        OGutterProv := OGutter.Providers[i];
+        if OGutterProv is TSynGutterLOvProviderModifiedLines then begin
+          Attri := GetUsedAttr(ahaModifiedLine);
+          if Attri <> nil then begin
+            OGutterProv.Color := Attri.Foreground;
+            TSynGutterLOvProviderModifiedLines(OGutterProv).ColorSaved := Attri.FrameColor;
+          end;
+        end
+        else
+        if OGutterProv is TSynGutterLOvProviderCurrentPage then begin
+          Attri := GetUsedAttr(ahaOverviewGutter);
+          if Attri <> nil then begin
+            OGutterProv.Color := Attri.FrameColor;
+          end;
+        end
+        else
+        if OGutterProv is TIDESynGutterLOvProviderPascal then begin
+          Attri := GetUsedAttr(ahaOverviewGutter);
+          if Attri <> nil then begin
+            OGutterProv.Color := Attri.Foreground;
+            TIDESynGutterLOvProviderPascal(OGutterProv).Color2 := Attri.Background;
+          end;
+        end;
+      end;
+    end;
+
     if ASynEdit is TIDESynEditor then
     begin
       IDESynEdit := TIDESynEditor(ASynEdit);
diff --git a/ide/editoroptions.res b/ide/editoroptions.res
index d3b6c859722ed6279cbab315d1cffa3de79f225e..56f915469c32d12202dc1972f9ad09f943e23389 100644
GIT binary patch
literal 65332
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

literal 66296
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

diff --git a/ide/frames/editor_color_options.pas b/ide/frames/editor_color_options.pas
index 2c26310124..6b9e33c883 100644
--- a/ide/frames/editor_color_options.pas
+++ b/ide/frames/editor_color_options.pas
@@ -287,8 +287,21 @@ begin
   TheTree.Canvas.Brush.Color := c;
   TheTree.Canvas.FillRect(NodeRect.Left+2, NodeRect.Top+2, NodeRect.Left+FullAbcWidth-2, NodeRect.Bottom-2);
 
+  // Special draw overview line gutter
+  if (AttriIdx = ord(ahaOverviewGutter)) then begin
+    TextY := (NodeRect.Bottom - NodeRect.Top - 4) Div 2;
+    TheTree.Canvas.Brush.Color := Attri.Foreground;
+    TheTree.Canvas.FillRect(NodeRect.Left+2, NodeRect.Top+2, NodeRect.Left+FullAbcWidth-2, NodeRect.Top+2+TextY);
+    TheTree.Canvas.Brush.Color := Attri.Background;
+    TheTree.Canvas.FillRect(NodeRect.Left+2, NodeRect.Top+2+TextY, NodeRect.Left+5, NodeRect.Bottom-2);
+    TextY := FullAbcWidth div 4;
+    TheTree.Canvas.Brush.Color := Attri.FrameColor;
+    TheTree.Canvas.FillRect(NodeRect.Left+2+TextY, NodeRect.Top+3, NodeRect.Left+FullAbcWidth-2-TextY, NodeRect.Bottom-3);
+    exit;
+  end;
+
   // Special draw Modified line gutter
-  if (AttriIdx = ord(ahaModifiedLine)) then begin
+  if (AttriIdx = ord(ahaModifiedLine))then begin
     TextY := NodeRect.Bottom - NodeRect.Top - 4;
     TheTree.Canvas.Brush.Color := Attri.Foreground;
     TheTree.Canvas.FillRect(NodeRect.Left+2, NodeRect.Top+2, NodeRect.Left+5, NodeRect.Bottom-2);
diff --git a/ide/lazarusidestrconsts.pas b/ide/lazarusidestrconsts.pas
index 392d155d99..f914e4a2dd 100644
--- a/ide/lazarusidestrconsts.pas
+++ b/ide/lazarusidestrconsts.pas
@@ -1982,6 +1982,9 @@ resourcestring
   dlgGutterCollapsedColor = 'Collapsed';
   dlgCaretForeColor = 'Color (NotXor)';
   dlgCaretBackColor = 'Multi/2nd (NotXor)';
+  dlgOverviewGutterBack1Color = 'Background 1';
+  dlgOverviewGutterBack2Color = 'Background 2';
+  dlgOverviewGutterPageColor = 'Page';
   dlgElementAttributes = 'Element Attributes';
   dlgEdBold = 'Bold';
   dlgEdItal = 'Italic';
@@ -2176,6 +2179,7 @@ resourcestring
   dlgAddHiSpecialVisibleChars     = 'Visualized Special Chars';
   dlgTopInfoHint                  = 'Current Class/Proc Hint';
   dlgCaretColor                   = 'Caret';
+  dlgOverviewGutterColor          = 'Overview Gutter';
   dlgIfDefBlockInactive           = 'Inactive $IFDEF code';
   dlgIfDefBlockActive             = 'Active $IFDEF code';
   dlgIfDefBlockTmpActive          = 'Included mixed state $IFDEF code';
diff --git a/ide/sourcemarks.pas b/ide/sourcemarks.pas
index 8bf8fbc532..d3867b4fdf 100644
--- a/ide/sourcemarks.pas
+++ b/ide/sourcemarks.pas
@@ -63,7 +63,7 @@ type
      ahaTemplateEditOther, ahaSyncroEditCur,      ahaSyncroEditSync,
      ahaSyncroEditOther,   ahaSyncroEditArea,     ahaGutterSeparator,
      ahaGutter,            ahaRightMargin,        ahaSpecialVisibleChars,
-     ahaTopInfoHint,       ahaCaretColor,
+     ahaTopInfoHint,       ahaCaretColor,         ahaOverviewGutter,
      ahaIfDefBlockInactive, ahaIfDefBlockActive, ahaIfDefBlockTmpActive,
      ahaIfDefNodeInactive, ahaIfDefNodeActive, ahaIfDefNodeTmpActive,
      ahaIdentComplWindow, ahaIdentComplWindowBorder, ahaIdentComplWindowSelection, ahaIdentComplWindowHighlight,
diff --git a/ide/syncolorattribeditor.pas b/ide/syncolorattribeditor.pas
index f6f1c6e115..83db17ea53 100644
--- a/ide/syncolorattribeditor.pas
+++ b/ide/syncolorattribeditor.pas
@@ -525,6 +525,12 @@ begin
 end;
 
 procedure TSynColorAttrEditor.UpdateAll;
+  function IsAhaElement(Element: TColorSchemeAttribute; aha: TAdditionalHilightAttribute): Boolean;
+  begin
+    Result := (FCurrentColorScheme <> nil) and
+              (FCurrentColorScheme.AttributeByEnum[aha] <> nil) and
+              (Element.StoredName = FCurrentColorScheme.AttributeByEnum[aha].StoredName);
+  end;
 begin
   if (FCurHighlightElement = nil) or UpdatingColor then
     Exit;
@@ -536,22 +542,21 @@ begin
     BackGroundUseDefaultCheckBox.Caption := dlgBackColor;
     FrameColorUseDefaultCheckBox.Caption := dlgFrameColor;
     if FCurrentColorScheme <> nil then begin
-      if (FCurrentColorScheme.AttributeByEnum[ahaModifiedLine] <> nil) and
-         (FCurHighlightElement.StoredName = FCurrentColorScheme.AttributeByEnum[ahaModifiedLine].StoredName)
-      then begin
+      if IsAhaElement(FCurHighlightElement, ahaModifiedLine) then begin
         ForeGroundUseDefaultCheckBox.Caption := dlgSavedLineColor;
         FrameColorUseDefaultCheckBox.Caption := dlgUnsavedLineColor;
       end else
-      if (FCurrentColorScheme.AttributeByEnum[ahaCodeFoldingTree] <> nil) and
-         (FCurHighlightElement.StoredName = FCurrentColorScheme.AttributeByEnum[ahaCodeFoldingTree].StoredName)
-      then begin
+      if IsAhaElement(FCurHighlightElement, ahaCodeFoldingTree) then begin
         FrameColorUseDefaultCheckBox.Caption := dlgGutterCollapsedColor;
       end else
-      if (FCurrentColorScheme.AttributeByEnum[ahaCaretColor] <> nil) and
-         (FCurHighlightElement.StoredName = FCurrentColorScheme.AttributeByEnum[ahaCaretColor].StoredName)
-      then begin
+      if IsAhaElement(FCurHighlightElement, ahaCaretColor) then begin
         ForeGroundUseDefaultCheckBox.Caption := dlgCaretForeColor;
         BackGroundUseDefaultCheckBox.Caption := dlgCaretBackColor;
+      end else
+      if IsAhaElement(FCurHighlightElement, ahaOverviewGutter) then begin
+        ForeGroundUseDefaultCheckBox.Caption := dlgOverviewGutterBack1Color;
+        BackGroundUseDefaultCheckBox.Caption := dlgOverviewGutterBack2Color;
+        FrameColorUseDefaultCheckBox.Caption := dlgOverviewGutterPageColor;
       end;
     end;