From a53f95f89825c04dc5e667fb6e75175bdd7d3281 Mon Sep 17 00:00:00 2001
From: martin <laz.git@mfriebe.de>
Date: Fri, 14 Dec 2012 18:15:00 +0000
Subject: [PATCH] SynEdit: Fix problems with resizing GutterParts. (Noticeable
 in right gutter)

git-svn-id: trunk@39540 -
---
 components/synedit/syngutter.pp     |  2 +-
 components/synedit/syngutterbase.pp | 31 +++++++++++++++++++++++------
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/components/synedit/syngutter.pp b/components/synedit/syngutter.pp
index 9a705c4c6d..f22c22ad9c 100644
--- a/components/synedit/syngutter.pp
+++ b/components/synedit/syngutter.pp
@@ -207,7 +207,7 @@ end;
 function TSynGutter.PixelToPartIndex(X: Integer): Integer;
 begin
   Result := 0;
-  x := x - LeftOffset;
+  x := x - Left - LeftOffset;
   while Result < PartCount-1 do begin
     if Parts[Result].Visible then begin
       if x >= Parts[Result].Width then
diff --git a/components/synedit/syngutterbase.pp b/components/synedit/syngutterbase.pp
index e8b9decc55..19eb393c1d 100644
--- a/components/synedit/syngutterbase.pp
+++ b/components/synedit/syngutterbase.pp
@@ -173,6 +173,7 @@ type
     procedure GutterVisibilityChanged; virtual;
     procedure SetWidth(const AValue : integer); virtual;
     procedure Init; override;
+    procedure VisibilityOrSize(aCallDoChange: Boolean = False);
     procedure DoResize(Sender: TObject); virtual;
     procedure DoChange(Sender: TObject); virtual;
     property GutterParts: TSynGutterPartListBase read GetGutterParts;
@@ -581,24 +582,27 @@ begin
   NewWidth := PreferedWidth;
   if FWidth = NewWidth then exit;
   FWidth := NewWidth;
-  Gutter.SetChildBounds;
-  DoResize(Self);
+  VisibilityOrSize;
 end;
 
 procedure TSynGutterPartBase.SetAutoSize(const AValue : boolean);
+var
+  OldSize: Integer;
 begin
   if FAutoSize=AValue then exit;
   FAutoSize:=AValue;
+  OldSize := FWidth;
   if FAutoSize then
     DoAutoSize;
+  if FWidth = OldSize then
+    DoChange(Self); // Size Did not Change
 end;
 
 procedure TSynGutterPartBase.SetVisible(const AValue : boolean);
 begin
   if FVisible=AValue then exit;
   FVisible:=AValue;
-  Gutter.SetChildBounds;
-  DoChange(self);
+  VisibilityOrSize(True);
 end;
 
 procedure TSynGutterPartBase.GutterVisibilityChanged;
@@ -610,8 +614,7 @@ procedure TSynGutterPartBase.SetWidth(const AValue : integer);
 begin
   if (FWidth=AValue) or (FAutoSize) then exit;
   FWidth:=AValue;
-  Gutter.SetChildBounds;
-  DoResize(Self);
+  VisibilityOrSize;
 end;
 
 procedure TSynGutterPartBase.DoChange(Sender : TObject);
@@ -649,6 +652,21 @@ begin
   FriendEdit := FSynEdit;
 end;
 
+procedure TSynGutterPartBase.VisibilityOrSize(aCallDoChange: Boolean);
+begin
+  Gutter.IncChangeLock;
+  try
+    if Gutter.AutoSize then
+      Gutter.DoAutoSize;  // Calculate new total width of gutter
+    Gutter.RecalcBounds;  // New Bounds (needs Gutter.Width) and call SetChildBounds
+    DoResize(Self);
+    if aCallDoChange then
+      DoChange(Self);
+  finally
+    Gutter.DecChangeLock;
+  end;
+end;
+
 procedure TSynGutterPartBase.DoResize(Sender: TObject);
 begin
   DoChange(Sender);
@@ -673,6 +691,7 @@ begin
     FAutoSize := Src.FAutoSize;
     MarkupInfo.Assign(Src.MarkupInfo);
     DoChange(Self);
+    // Todo, maybe on Resize?
   end else
     inherited;
 end;