mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-22 11:19:26 +02:00
IDE: EditorOptions, user colors fixed frame init. Issue #0025853
git-svn-id: trunk@44409 -
This commit is contained in:
parent
e3b1d7060b
commit
8d8f500e71
@ -112,8 +112,6 @@ type
|
||||
procedure UpdateListDropDownFull;
|
||||
procedure UpdateListDropDownCaption;
|
||||
procedure UpdateListDisplay(KeepDuplicates: Boolean = False);
|
||||
protected
|
||||
procedure SetVisible(Value: Boolean); override;
|
||||
public
|
||||
constructor Create(AOwner: TComponent); override;
|
||||
destructor Destroy; override;
|
||||
@ -634,24 +632,6 @@ begin
|
||||
WordListSelection(nil, 0, 0);
|
||||
end;
|
||||
|
||||
procedure TEditorMarkupUserDefinedFrame.SetVisible(Value: Boolean);
|
||||
begin
|
||||
if FGlobalColors <> nil then begin
|
||||
// Finish ReadSettings - Now TEditorKeymappingOptionsFrame should be ready
|
||||
FUserWordsList.Assign(FGlobalColors);
|
||||
FSelectedListIdx := 0;
|
||||
UpdateListDropDownFull;
|
||||
UpdateListDisplay;
|
||||
tbDeleteList.Enabled := FUserWordsList.Count > 0;
|
||||
FGlobalColors := nil;
|
||||
UpdateKeys;
|
||||
end
|
||||
else
|
||||
UpdateKeys;
|
||||
|
||||
inherited SetVisible(Value);
|
||||
end;
|
||||
|
||||
constructor TEditorMarkupUserDefinedFrame.Create(AOwner: TComponent);
|
||||
begin
|
||||
inherited Create(AOwner);
|
||||
@ -705,6 +685,16 @@ procedure TEditorMarkupUserDefinedFrame.ReadSettings(AOptions: TAbstractIDEOptio
|
||||
begin
|
||||
FGlobalColors := TEditorOptions(AOptions).UserDefinedColors;
|
||||
FSelectedListIdx := 0;
|
||||
|
||||
FKeyOptFrame.ReadSettings(AOptions);
|
||||
|
||||
FUserWordsList.Assign(FGlobalColors);
|
||||
FSelectedListIdx := 0;
|
||||
UpdateListDropDownFull;
|
||||
UpdateListDisplay;
|
||||
tbDeleteList.Enabled := FUserWordsList.Count > 0;
|
||||
FGlobalColors := nil;
|
||||
UpdateKeys;
|
||||
end;
|
||||
|
||||
procedure TEditorMarkupUserDefinedFrame.WriteSettings(AOptions: TAbstractIDEOptions);
|
||||
|
Loading…
Reference in New Issue
Block a user