IDE: depending checkboxes: indent more

git-svn-id: trunk@25036 -

components/synedit/synedithighlighter.pp

@@ -209,6 +209,17 @@ type
     property OnChange: TNotifyEvent read fOnChange write fOnChange;
   end;
 
+  { TSynEditLinesList }
+
+  TSynEditLinesList=class(TFPList)
+  private
+    function GetSynString(Index: Integer): TSynEditStringsBase;
+    procedure PutSynStrings(Index: Integer; const AValue: TSynEditStringsBase);
+  public
+    property Items[Index: Integer]: TSynEditStringsBase
+             read GetSynString write PutSynStrings; default;
+  end;
+
   { TSynCustomHighlighter }
 
   TSynCustomHighlighter = class(TComponent)
@@ -216,6 +227,7 @@ type
     fAttributes: TStringList;
     fAttrChangeHooks: TMethodList;
     FCapabilities: TSynHighlighterCapabilities;
+    FKnownLines: TSynEditLinesList;
     FCurrentLines: TSynEditStringsBase;
     FCurrentRanges: TSynHighlighterRangeList;
     FDrawDividerLevel: Integer;
@@ -225,7 +237,7 @@ type
     fEnabled: Boolean;
     fWordBreakChars: TSynIdentChars;
     FIsScanning: Boolean;
-    procedure SetCurrentLines(const AValue: TSynEditStringsBase);
+    function GetKnownRanges(Index: Integer): TSynHighlighterRangeList;
     procedure SetDrawDividerLevel(const AValue: Integer);
     procedure SetEnabled(const Value: boolean);                                 //DDH 2001-10-23
   protected
@@ -247,15 +259,20 @@ type
     procedure SetAttributesOnChange(AEvent: TNotifyEvent);
     procedure SetDefaultFilter(Value: string); virtual;
     procedure SetSampleSource(Value: string); virtual;
+    function GetRangeIdentifier: Pointer; virtual;
     function CreateRangeList: TSynHighlighterRangeList; virtual;
     function UpdateRangeInfoAtLine(Index: Integer): Boolean; virtual; // Returns true if range changed
     // code fold - only valid if hcCodeFolding in Capabilities
+    procedure SetCurrentLines(const AValue: TSynEditStringsBase); virtual;
     property  LineIndex: Integer read FLineIndex;
     property CurrentRanges: TSynHighlighterRangeList read FCurrentRanges;
     function GetDrawDivider(Index: integer): TSynDividerDrawConfigSetting; virtual;
     function GetDividerDrawConfig(Index: Integer): TSynDividerDrawConfig; virtual;
     function GetDividerDrawConfigCount: Integer; virtual;
+    function PerformScan(StartIndex, EndIndex: Integer): Integer; virtual;
     property IsScanning: Boolean read FIsScanning;
+    property KnownRanges[Index: Integer]: TSynHighlighterRangeList read GetKnownRanges;
+    property KnownLines: TSynEditLinesList read FKnownLines;
   public
     procedure DefHighlightChange(Sender: TObject);
     property  AttributeChangeNeedScan: Boolean read FAttributeChangeNeedScan;
@@ -886,6 +903,18 @@ begin
 end;
 {$ENDIF}
 
+{ TSynEditLinesList }
+
+function TSynEditLinesList.GetSynString(Index: Integer): TSynEditStringsBase;
+begin
+  Result := TSynEditStringsBase(inherited Items[Index]);
+end;
+
+procedure TSynEditLinesList.PutSynStrings(Index: Integer; const AValue: TSynEditStringsBase);
+begin
+  inherited Items[Index] := AValue;
+end;
+
 { TSynCustomHighlighter }
 
 constructor TSynCustomHighlighter.Create(AOwner: TComponent);
@@ -893,6 +922,7 @@ begin
   {$IFDEF SYN_LAZARUS}
   FCapabilities:=GetCapabilities;
   {$ENDIF}
+  FKnownLines := TSynEditLinesList.Create;
   inherited Create(AOwner);
   fWordBreakChars := TSynWordBreakChars;
   fAttributes := TStringList.Create;
@@ -908,6 +938,7 @@ begin
   fAttributes.Free;
   fAttrChangeHooks.Free;
   inherited Destroy;
+  FreeAndNil(FKnownLines);
 end;
 
 procedure TSynCustomHighlighter.BeginUpdate;
@@ -1215,6 +1246,11 @@ procedure TSynCustomHighlighter.SetSampleSource(Value: string);
 begin
 end;
 
+function TSynCustomHighlighter.GetRangeIdentifier: Pointer;
+begin
+  Result := self;
+end;
+
 function TSynCustomHighlighter.CreateRangeList: TSynHighlighterRangeList;
 begin
   Result := TSynHighlighterRangeList.Create;
@@ -1237,31 +1273,36 @@ end;
 
 procedure TSynCustomHighlighter.ScanRanges;
 var
-  StartIndex, EndIndex, CurrentIndex, c: Integer;
+  StartIndex, EndIndex: Integer;
 begin
   StartIndex := CurrentRanges.NeedsReScanStartIndex;
   if (StartIndex < 0) or (StartIndex >= CurrentRanges.Count) then exit;
   EndIndex := CurrentRanges.NeedsReScanEndIndex + 1;
-  CurrentIndex := StartIndex;
-  c := CurrentLines.Count;
   FIsScanning := True;
   try
-    StartAtLineIndex(CurrentIndex);
-    NextToEol;
-    while UpdateRangeInfoAtLine(CurrentIndex) or
-          (CurrentIndex <= EndIndex)
-    do begin
-      inc(CurrentIndex);
-      if CurrentIndex = c then
-        break;
-      ContinueNextLine;
-      NextToEol;
-    end;
+    EndIndex :=  PerformScan(StartIndex, EndIndex);
   finally
     FIsScanning := False;
   end;
   CurrentRanges.ClearReScanNeeded;
-  CurrentLines.SendHighlightChanged(StartIndex, CurrentIndex - StartIndex + 1);
+  CurrentLines.SendHighlightChanged(StartIndex, EndIndex - StartIndex + 1);
+end;
+
+function TSynCustomHighlighter.PerformScan(StartIndex, EndIndex: Integer): Integer;
+var
+  c: Integer;
+begin
+  Result := StartIndex;
+  c := CurrentLines.Count;
+  StartAtLineIndex(Result);
+  NextToEol;
+  while UpdateRangeInfoAtLine(Result) or (Result <= EndIndex) do begin
+    inc(Result);
+    if Result = c then
+      break;
+    ContinueNextLine;
+    NextToEol;
+  end;
 end;
 
 procedure TSynCustomHighlighter.ScanAllRanges;
@@ -1287,19 +1328,20 @@ begin
   if AValue = FCurrentLines then
     exit;
   FCurrentLines := AValue;
-  FCurrentRanges := TSynHighlighterRangeList(AValue.Ranges[ClassType]);
+  FCurrentRanges := TSynHighlighterRangeList(AValue.Ranges[GetRangeIdentifier]);
 end;
 
 procedure TSynCustomHighlighter.AttachToLines(Lines: TSynEditStringsBase);
 var
   r: TSynHighlighterRangeList;
 begin
-  r := TSynHighlighterRangeList(Lines.Ranges[ClassType]);
+  r := TSynHighlighterRangeList(Lines.Ranges[GetRangeIdentifier]);
   if assigned(r) then
     r.IncRefCount
   else begin
+    FKnownLines.Add(Lines);
     r := CreateRangeList;
-    Lines.Ranges[ClassType] := r;
+    Lines.Ranges[GetRangeIdentifier] := r;
     r.InvalidateAll;
   end;
   FCurrentLines := nil;
@@ -1309,13 +1351,14 @@ procedure TSynCustomHighlighter.DetachFromLines(Lines: TSynEditStringsBase);
 var
   r: TSynHighlighterRangeList;
 begin
-  r := TSynHighlighterRangeList(Lines.Ranges[ClassType]);
+  r := TSynHighlighterRangeList(Lines.Ranges[GetRangeIdentifier]);
   if not assigned(r) then exit;
   r.DecRefCount;
   if r.RefCount = 0 then begin
-    Lines.Ranges[ClassType] := nil;
+    Lines.Ranges[GetRangeIdentifier] := nil;
     r.Free;
   end;
+  FKnownLines.Remove(Lines);
 end;
 
 procedure TSynCustomHighlighter.SetDrawDividerLevel(const AValue: Integer);
@@ -1325,6 +1368,11 @@ begin
   //DefHighlightChange(Self);
 end;
 
+function TSynCustomHighlighter.GetKnownRanges(Index: Integer): TSynHighlighterRangeList;
+begin
+  Result := TSynHighlighterRangeList(KnownLines[Index].Ranges[GetRangeIdentifier]);
+end;
+
 function TSynCustomHighlighter.GetDrawDivider(Index: integer): TSynDividerDrawConfigSetting;
 begin
   result := SynEmptyDividerDrawConfigSetting;

components/synedit/synedittextbase.pas

@@ -78,7 +78,7 @@ type
     procedure InsertRows(AIndex, ACount: Integer); virtual;
     procedure DeleteRows(AIndex, ACount: Integer); virtual;
     property Capacity: Integer read FCapacity write SetCapacity;
-    // Count must be maintained by owner
+    // Capacity must be maintained by owner (Shrink)
     property Count: Integer read FCount write SetCount;
   end;
 
@@ -98,19 +98,21 @@ type
   TSynManagedStorageMemList = class
   private
     FStorageMemList: Array of TSynManagedStorageMem;
-    FClassList: Array of TClass;
-    function GetStorageMems(Index: TClass): TSynManagedStorageMem;
-    procedure SetStorageMems(Index: TClass; const AValue: TSynManagedStorageMem);
+    FClassList: Array of Pointer;
+    function GetStorageMems(Index: Pointer): TSynManagedStorageMem;
+    procedure SetStorageMems(Index: Pointer; const AValue: TSynManagedStorageMem);
     procedure SetChildCapacities(const AValue: Integer);
     procedure SetChildCounts(const AValue: Integer);
   public
+    procedure ChildInsertRows(AIndex, ACount: Integer);
+    procedure ChildDeleteRows(AIndex, ACount: Integer);
     procedure CallMove(AFrom, ATo, ALen: Integer);
     procedure CallLineTextChanged(AIndex: Integer);
     procedure CallInsertedLines(AIndex, ACount: Integer);
     procedure CallDeletedLines(AIndex, ACount: Integer);
     property ChildCapacities: Integer write SetChildCapacities;
     property ChildCounts: Integer write SetChildCounts;
-    property StorageMems[Index: TClass]: TSynManagedStorageMem
+    property StorageMems[Index: Pointer]: TSynManagedStorageMem
              read GetStorageMems write SetStorageMems; default;
   end;
 
@@ -118,11 +120,11 @@ type
 
   TSynEditStringsBase = class(TStrings)
   protected
-    function GetRange(Index: TClass): TSynEditStorageMem; virtual; abstract;
-    procedure PutRange(Index: TClass; const ARange: TSynEditStorageMem); virtual; abstract;
+    function GetRange(Index: Pointer): TSynManagedStorageMem; virtual; abstract;
+    procedure PutRange(Index: Pointer; const ARange: TSynManagedStorageMem); virtual; abstract;
   public
     procedure SendHighlightChanged(aIndex, aCount: Integer); virtual; abstract;
-    property Ranges[Index: TClass]: TSynEditStorageMem read GetRange write PutRange;
+    property Ranges[Index: Pointer]: TSynManagedStorageMem read GetRange write PutRange;
   end;
 
   { TSynEditStrings }
@@ -219,8 +221,8 @@ type
     function  GetIsUtf8 : Boolean;  override;
     procedure SetIsUtf8(const AValue : Boolean);  override;
 
-    function GetRange(Index: TClass): TSynEditStorageMem; override;
-    procedure PutRange(Index: TClass; const ARange: TSynEditStorageMem); override;
+    function GetRange(Index: Pointer): TSynManagedStorageMem; override;
+    procedure PutRange(Index: Pointer; const ARange: TSynManagedStorageMem); override;
 
     function  GetAttribute(const Owner: TClass; const Index: Integer): Pointer; override;
     procedure SetAttribute(const Owner: TClass; const Index: Integer; const AValue: Pointer); override;
@@ -650,12 +652,12 @@ begin
 end;
 
 //Ranges
-function TSynEditStringsLinked.GetRange(Index: TClass): TSynEditStorageMem;
+function TSynEditStringsLinked.GetRange(Index: Pointer): TSynManagedStorageMem;
 begin
   Result:= fSynStrings.Ranges[Index];
 end;
 
-procedure TSynEditStringsLinked.PutRange(Index: TClass; const ARange: TSynEditStorageMem);
+procedure TSynEditStringsLinked.PutRange(Index: Pointer; const ARange: TSynManagedStorageMem);
 begin
   fSynStrings.Ranges[Index] := ARange;
 end;
@@ -1264,6 +1266,8 @@ begin
   if LinesAfter > 0 then
     Move(AIndex + ACount, AIndex, LinesAfter);
   Count := Count - ACount;
+  if (Capacity > 16) and (Capacity > Count * 2) then
+    Capacity := Capacity - (Count div 2);
 end;
 
 procedure TSynEditStorageMem.Move(AFrom, ATo, ALen: Integer);
@@ -1297,7 +1301,7 @@ end;
 
 { TSynManagedStorageMemList }
 
-function TSynManagedStorageMemList.GetStorageMems(Index: TClass): TSynManagedStorageMem;
+function TSynManagedStorageMemList.GetStorageMems(Index: Pointer): TSynManagedStorageMem;
 var
   i: Integer;
 begin
@@ -1310,7 +1314,7 @@ begin
   end;
 end;
 
-procedure TSynManagedStorageMemList.SetStorageMems(Index: TClass;
+procedure TSynManagedStorageMemList.SetStorageMems(Index: Pointer;
   const AValue: TSynManagedStorageMem);
 var
   i, j: Integer;
@@ -1361,6 +1365,22 @@ begin
     FStorageMemList[i].Count := AValue;
 end;
 
+procedure TSynManagedStorageMemList.ChildInsertRows(AIndex, ACount: Integer);
+var
+  i: Integer;
+begin
+  for i := 0 to high(FStorageMemList) do
+    FStorageMemList[i].InsertRows(AIndex, ACount);
+end;
+
+procedure TSynManagedStorageMemList.ChildDeleteRows(AIndex, ACount: Integer);
+var
+  i: Integer;
+begin
+  for i := 0 to high(FStorageMemList) do
+    FStorageMemList[i].DeleteRows(AIndex, ACount);
+end;
+
 procedure TSynManagedStorageMemList.CallMove(AFrom, ATo, ALen: Integer);
 var
   i: Integer;

components/synedit/synedittextbuffer.pp

@@ -90,12 +90,12 @@ type
     function GetAttribute(Index: Integer; Pos: Integer; Size: Word): Pointer;
     function GetAttributeSize: Integer;
     function GetObject(Index: Integer): TObject;
-    function GetRange(Index: TClass): TSynManagedStorageMem;
+    function GetRange(Index: Pointer): TSynManagedStorageMem;
     function GetString(Index: Integer): String;
     procedure SetAttribute(Index: Integer; Pos: Integer; Size: Word; const AValue: Pointer);
     procedure SetAttributeSize(const AValue: Integer);
     procedure SetObject(Index: Integer; const AValue: TObject);
-    procedure SetRange(Index: TClass; const AValue: TSynManagedStorageMem);
+    procedure SetRange(Index: Pointer; const AValue: TSynManagedStorageMem);
     procedure SetString(Index: Integer; const AValue: String);
   protected
     procedure Move(AFrom, ATo, ALen: Integer); override;
@@ -114,7 +114,7 @@ type
       read  GetAttribute write SetAttribute;
     property AttributeSize: Integer read  GetAttributeSize write SetAttributeSize;
 
-    property RangeList[Index: TClass]: TSynManagedStorageMem read GetRange write SetRange;
+    property RangeList[Index: Pointer]: TSynManagedStorageMem read GetRange write SetRange;
   end;
 
   { TSynEditStringList }
@@ -163,8 +163,8 @@ type
     procedure IgnoreSendNotification(AReason: TSynEditNotifyReason;
                                      IncIgnore: Boolean); override;
 
-    function GetRange(Index: TClass): TSynEditStorageMem; override;
-    procedure PutRange(Index: TClass; const ARange: TSynEditStorageMem); override;
+    function GetRange(Index: Pointer): TSynManagedStorageMem; override;
+    procedure PutRange(Index: Pointer; const ARange: TSynManagedStorageMem); override;
     function  GetAttribute(const Owner: TClass; const Index: Integer): Pointer; override;
     procedure SetAttribute(const Owner: TClass; const Index: Integer; const AValue: Pointer); override;
     function Get(Index: integer): string; override;
@@ -709,7 +709,7 @@ begin
     Result := nil;
 end;
 
-function TSynEditStringList.GetRange(Index: TClass): TSynEditStorageMem;
+function TSynEditStringList.GetRange(Index: Pointer): TSynManagedStorageMem;
 begin
   Result := FList.RangeList[Index];
 end;
@@ -820,9 +820,9 @@ begin
   EndUpdate;
 end;
 
-procedure TSynEditStringList.PutRange(Index: TClass; const ARange: TSynEditStorageMem);
+procedure TSynEditStringList.PutRange(Index: Pointer; const ARange: TSynManagedStorageMem);
 begin
-  FList.RangeList[Index] := ARange as TSynManagedStorageMem;
+  FList.RangeList[Index] := ARange;
 end;
 
 function TSynEditStringList.GetAttribute(const Owner: TClass; const Index: Integer): Pointer;
@@ -1213,7 +1213,7 @@ begin
   Result := (PObject(Mem + Index * FAttributeSize + SizeOf(String)))^;
 end;
 
-function TSynEditStringMemory.GetRange(Index: TClass): TSynManagedStorageMem;
+function TSynEditStringMemory.GetRange(Index: Pointer): TSynManagedStorageMem;
 begin
   Result := FRangeList[Index];
 end;
@@ -1223,7 +1223,7 @@ begin
   (PObject(Mem + Index * FAttributeSize + SizeOf(String)))^ := AValue;
 end;
 
-procedure TSynEditStringMemory.SetRange(Index: TClass; const AValue: TSynManagedStorageMem);
+procedure TSynEditStringMemory.SetRange(Index: Pointer; const AValue: TSynManagedStorageMem);
 begin
   FRangeList[Index] := AValue;
 

ide/frames/files_options.lfm

@@ -11,9 +11,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 0
-    Height = 16
+    Height = 18
     Top = 0
-    Width = 139
+    Width = 165
     Caption = 'MaxRecentOpenFilesLabel'
     ParentColor = False
   end
@@ -22,9 +22,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = MaxRecentOpenFilesComboBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 16
-    Top = 45
-    Width = 147
+    Height = 18
+    Top = 53
+    Width = 175
     BorderSpacing.Top = 6
     Caption = 'MaxRecentProjectFilesLabel'
     ParentColor = False
@@ -36,11 +36,11 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 23
-    Top = 16
+    Height = 29
+    Top = 18
     Width = 569
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 15
+    ItemHeight = 0
     Items.Strings = (
       '5'
       '10'
@@ -58,11 +58,11 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 23
-    Top = 61
+    Height = 29
+    Top = 71
     Width = 569
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 15
+    ItemHeight = 0
     Items.Strings = (
       '5'
       '10'
@@ -79,9 +79,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 19
-    Top = 90
-    Width = 195
+    Height = 22
+    Top = 106
+    Width = 238
     BorderSpacing.Top = 6
     Caption = 'OpenLastProjectAtStartCheckBox'
     TabOrder = 2
@@ -92,9 +92,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Side = asrBottom
     Left = 0
-    Height = 19
-    Top = 109
-    Width = 180
+    Height = 22
+    Top = 128
+    Width = 213
     Caption = 'ShowCompileDialogCheckBox'
     OnChange = ShowCompileDialogCheckBoxChange
     TabOrder = 3
@@ -104,9 +104,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = AutoCloseCompileDialogCheckBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 16
-    Top = 157
-    Width = 83
+    Height = 18
+    Top = 182
+    Width = 103
     BorderSpacing.Top = 10
     Caption = 'LazarusDirLabel'
     ParentColor = False
@@ -119,8 +119,8 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideBottom.Control = LazarusDirComboBox
     AnchorSideBottom.Side = asrBottom
     Left = 544
-    Height = 23
-    Top = 173
+    Height = 29
+    Top = 200
     Width = 25
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
@@ -133,11 +133,11 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = LazarusDirButton
     Left = 0
-    Height = 23
-    Top = 173
+    Height = 29
+    Top = 200
     Width = 544
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 15
+    ItemHeight = 0
     TabOrder = 5
     Text = 'LazarusDirComboBox'
   end
@@ -147,11 +147,11 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = CompilerPathButton
     Left = 0
-    Height = 23
-    Top = 218
+    Height = 29
+    Top = 253
     Width = 544
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 15
+    ItemHeight = 0
     TabOrder = 6
     Text = 'CompilerPathComboBox'
   end
@@ -162,8 +162,8 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideBottom.Control = CompilerPathComboBox
     AnchorSideBottom.Side = asrBottom
     Left = 544
-    Height = 23
-    Top = 218
+    Height = 29
+    Top = 253
     Width = 25
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
@@ -175,9 +175,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = LazarusDirComboBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 16
-    Top = 202
-    Width = 102
+    Height = 18
+    Top = 235
+    Width = 120
     BorderSpacing.Top = 6
     Caption = 'CompilerPathLabel'
     ParentColor = False
@@ -188,11 +188,11 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = FPCSourceDirButton
     Left = 0
-    Height = 23
-    Top = 263
+    Height = 29
+    Top = 306
     Width = 544
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 15
+    ItemHeight = 0
     TabOrder = 8
     Text = 'FPCSourceDirComboBox'
   end
@@ -203,8 +203,8 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideBottom.Control = FPCSourceDirComboBox
     AnchorSideBottom.Side = asrBottom
     Left = 544
-    Height = 23
-    Top = 263
+    Height = 29
+    Top = 306
     Width = 25
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
@@ -216,9 +216,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = CompilerPathComboBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 16
-    Top = 247
-    Width = 101
+    Height = 18
+    Top = 288
+    Width = 122
     BorderSpacing.Top = 6
     Caption = 'FPCSourceDirLabel'
     ParentColor = False
@@ -228,9 +228,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = FPCSourceDirComboBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 16
-    Top = 292
-    Width = 82
+    Height = 18
+    Top = 341
+    Width = 97
     BorderSpacing.Top = 6
     Caption = 'MakePathLabel'
     ParentColor = False
@@ -240,9 +240,9 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = MakePathComboBox
     AnchorSideTop.Side = asrBottom
     Left = 0
-    Height = 16
-    Top = 337
-    Width = 93
+    Height = 18
+    Top = 394
+    Width = 109
     BorderSpacing.Top = 6
     Caption = 'TestBuildDirLabel'
     ParentColor = False
@@ -253,11 +253,11 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = MakePathButton
     Left = 0
-    Height = 23
-    Top = 308
+    Height = 29
+    Top = 359
     Width = 544
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 15
+    ItemHeight = 0
     TabOrder = 10
     Text = 'MakePathComboBox'
   end
@@ -268,8 +268,8 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideBottom.Control = MakePathComboBox
     AnchorSideBottom.Side = asrBottom
     Left = 544
-    Height = 23
-    Top = 308
+    Height = 29
+    Top = 359
     Width = 25
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
@@ -282,11 +282,11 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Control = TestBuildDirButton
     Left = 0
-    Height = 23
-    Top = 353
+    Height = 29
+    Top = 412
     Width = 544
     Anchors = [akTop, akLeft, akRight]
-    ItemHeight = 15
+    ItemHeight = 0
     TabOrder = 12
     Text = 'TestBuildDirComboBox'
   end
@@ -297,8 +297,8 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideBottom.Control = TestBuildDirComboBox
     AnchorSideBottom.Side = asrBottom
     Left = 544
-    Height = 23
-    Top = 353
+    Height = 29
+    Top = 412
     Width = 25
     Anchors = [akTop, akRight, akBottom]
     Caption = '...'
@@ -310,11 +310,11 @@ inherited FilesOptionsFrame: TFilesOptionsFrame
     AnchorSideTop.Control = ShowCompileDialogCheckBox
     AnchorSideTop.Side = asrBottom
     AnchorSideRight.Side = asrBottom
-    Left = 6
-    Height = 19
-    Top = 128
-    Width = 206
-    BorderSpacing.Left = 6
+    Left = 30
+    Height = 22
+    Top = 150
+    Width = 244
+    BorderSpacing.Left = 30
     Caption = 'AutoCloseCompileDialogCheckBox'
     TabOrder = 14
   end

ide/frames/formed_options.lfm

@@ -15,14 +15,14 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 232
-    Height = 141
+    Height = 169
     Top = 0
     Width = 537
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     BorderSpacing.Left = 6
     Caption = 'GridGroupBox'
-    ClientHeight = 123
+    ClientHeight = 150
     ClientWidth = 533
     TabOrder = 0
     object GridSizeXLabel: TLabel
@@ -30,9 +30,9 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideTop.Control = GridSizeXSpinEdit
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 14
-      Top = 72
-      Width = 70
+      Height = 18
+      Top = 88
+      Width = 96
       BorderSpacing.Around = 6
       Caption = 'GridSizeXLabel'
       ParentColor = False
@@ -42,9 +42,9 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideTop.Control = GridSizeYSpinEdit
       AnchorSideTop.Side = asrCenter
       Left = 6
-      Height = 14
-      Top = 99
-      Width = 70
+      Height = 18
+      Top = 121
+      Width = 95
       BorderSpacing.Around = 6
       Caption = 'GridSizeYLabel'
       ParentColor = False
@@ -56,9 +56,9 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideRight.Control = GridGroupBox
       AnchorSideRight.Side = asrBottom
       Left = 6
-      Height = 17
-      Top = 46
-      Width = 120
+      Height = 22
+      Top = 56
+      Width = 159
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
       BorderSpacing.Right = 6
@@ -69,9 +69,9 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideLeft.Control = GridGroupBox
       AnchorSideTop.Control = GridGroupBox
       Left = 6
-      Height = 17
+      Height = 22
       Top = 6
-      Width = 110
+      Width = 147
       BorderSpacing.Left = 6
       BorderSpacing.Top = 6
       Caption = 'ShowGridCheckBox'
@@ -82,9 +82,9 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideTop.Control = ShowGridCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 17
-      Top = 26
-      Width = 152
+      Height = 22
+      Top = 31
+      Width = 204
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
       Caption = 'ShowBorderSpaceCheckBox'
@@ -95,9 +95,9 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = SnapToGridCheckBox
       AnchorSideTop.Side = asrBottom
-      Left = 82
-      Height = 21
-      Top = 69
+      Left = 108
+      Height = 27
+      Top = 84
       Width = 64
       BorderSpacing.Around = 6
       MaxValue = 128
@@ -112,9 +112,9 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideLeft.Side = asrBottom
       AnchorSideTop.Control = GridSizeXSpinEdit
       AnchorSideTop.Side = asrBottom
-      Left = 82
-      Height = 21
-      Top = 96
+      Left = 107
+      Height = 27
+      Top = 117
       Width = 64
       BorderSpacing.Around = 6
       MaxValue = 128
@@ -134,14 +134,14 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
     AnchorSideBottom.Control = Owner
     AnchorSideBottom.Side = asrBottom
     Left = 0
-    Height = 207
-    Top = 220
+    Height = 253
+    Top = 259
     Width = 769
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     BorderSpacing.Top = 6
     Caption = 'FormEditMiscGroupBox'
-    ClientHeight = 189
+    ClientHeight = 234
     ClientWidth = 765
     TabOrder = 1
     object ShowComponentCaptionsCheckBox: TCheckBox
@@ -151,9 +151,9 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideRight.Control = FormEditMiscGroupBox
       AnchorSideRight.Side = asrBottom
       Left = 6
-      Height = 17
-      Top = 26
-      Width = 188
+      Height = 22
+      Top = 31
+      Width = 252
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
       BorderSpacing.Right = 6
@@ -167,9 +167,9 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideRight.Control = FormEditMiscGroupBox
       AnchorSideRight.Side = asrBottom
       Left = 6
-      Height = 17
-      Top = 46
-      Width = 143
+      Height = 22
+      Top = 56
+      Width = 191
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
       BorderSpacing.Right = 6
@@ -183,9 +183,9 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideRight.Control = FormEditMiscGroupBox
       AnchorSideRight.Side = asrBottom
       Left = 6
-      Height = 17
-      Top = 66
-      Width = 192
+      Height = 22
+      Top = 81
+      Width = 256
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
       BorderSpacing.Right = 6
@@ -199,9 +199,9 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideRight.Control = FormEditMiscGroupBox
       AnchorSideRight.Side = asrBottom
       Left = 6
-      Height = 17
-      Top = 86
-      Width = 145
+      Height = 22
+      Top = 106
+      Width = 195
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
       Caption = 'RightClickSelectsCheckBox'
@@ -214,9 +214,9 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideRight.Control = FormEditMiscGroupBox
       AnchorSideRight.Side = asrBottom
       Left = 6
-      Height = 17
-      Top = 106
-      Width = 153
+      Height = 22
+      Top = 131
+      Width = 204
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
       Caption = 'DesignerPaintLazyCheckBox'
@@ -229,9 +229,9 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideTop.Control = DesignerPaintLazyCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 17
-      Top = 126
-      Width = 180
+      Height = 22
+      Top = 156
+      Width = 244
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
       BorderSpacing.Bottom = 3
@@ -247,7 +247,7 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideRight.Control = FormEditMiscGroupBox
       AnchorSideRight.Side = asrBottom
       Left = 6
-      Height = 17
+      Height = 22
       Top = 6
       Width = 759
       Anchors = [akTop, akLeft, akRight]
@@ -261,9 +261,9 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideTop.Control = SwitchToFavoritesOITabCheckBox
       AnchorSideTop.Side = asrBottom
       Left = 6
-      Height = 17
-      Top = 166
-      Width = 210
+      Height = 22
+      Top = 206
+      Width = 280
       BorderSpacing.Left = 6
       BorderSpacing.Top = 3
       BorderSpacing.Bottom = 6
@@ -271,14 +271,14 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       TabOrder = 7
     end
     object SwitchToFavoritesOITabCheckBox: TCheckBox
-      AnchorSideLeft.Control = FormEditMiscGroupBox
+      AnchorSideLeft.Control = CreateCompFocusNameCheckBox
       AnchorSideTop.Control = CreateCompFocusNameCheckBox
       AnchorSideTop.Side = asrBottom
-      Left = 12
-      Height = 17
-      Top = 146
-      Width = 183
-      BorderSpacing.Left = 12
+      Left = 36
+      Height = 22
+      Top = 181
+      Width = 232
+      BorderSpacing.Left = 30
       BorderSpacing.Top = 3
       Caption = 'SwitchToFavoritesOITabCheckBox'
       ParentShowHint = False
@@ -295,15 +295,15 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
     AnchorSideRight.Side = asrBottom
     AnchorSideBottom.Side = asrBottom
     Left = 232
-    Height = 67
-    Top = 147
+    Height = 78
+    Top = 175
     Width = 537
     Anchors = [akTop, akLeft, akRight]
     AutoSize = True
     BorderSpacing.Left = 6
     BorderSpacing.Top = 6
     Caption = 'GuideLinesGroupBox'
-    ClientHeight = 49
+    ClientHeight = 59
     ClientWidth = 533
     TabOrder = 2
     object ShowGuideLinesCheckBox: TCheckBox
@@ -311,7 +311,7 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideRight.Control = GuideLinesGroupBox
       AnchorSideRight.Side = asrBottom
       Left = 6
-      Height = 17
+      Height = 22
       Top = 6
       Width = 521
       Anchors = [akTop, akLeft, akRight]
@@ -328,8 +328,8 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideRight.Control = GuideLinesGroupBox
       AnchorSideRight.Side = asrBottom
       Left = 6
-      Height = 17
-      Top = 26
+      Height = 22
+      Top = 31
       Width = 521
       Anchors = [akTop, akLeft, akRight]
       BorderSpacing.Left = 6
@@ -348,12 +348,12 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
     AnchorSideBottom.Control = GuideLinesGroupBox
     AnchorSideBottom.Side = asrBottom
     Left = 0
-    Height = 214
+    Height = 253
     Top = 0
     Width = 226
     Anchors = [akTop, akLeft, akBottom]
     Caption = 'DesignerColorsGroupBox'
-    ClientHeight = 196
+    ClientHeight = 234
     ClientWidth = 222
     TabOrder = 3
     object ColorsListBox: TColorListBox
@@ -361,7 +361,7 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideTop.Control = DesignerColorsGroupBox
       AnchorSideBottom.Control = ColorBox
       Left = 6
-      Height = 156
+      Height = 185
       Top = 6
       Width = 210
       Style = [cbCustomColors]
@@ -371,6 +371,7 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       ItemHeight = 0
       OnSelectionChange = ColorsListBoxSelectionChange
       TabOrder = 0
+      TopIndex = -1
     end
     object ColorBox: TColorBox
       AnchorSideLeft.Control = DesignerColorsGroupBox
@@ -381,8 +382,8 @@ inherited FormEditorOptionsFrame: TFormEditorOptionsFrame
       AnchorSideBottom.Control = DesignerColorsGroupBox
       AnchorSideBottom.Side = asrBottom
       Left = 6
-      Height = 22
-      Top = 168
+      Height = 31
+      Top = 197
       Width = 210
       Style = [cbStandardColors, cbExtendedColors, cbSystemColors, cbCustomColor, cbPrettyNames]
       Anchors = [akLeft, akBottom]