paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-14 08:59:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

ide: loading a docked desktop for the first time, take the settings from the previous desktop. Issue #31981

Browse Source 
git-svn-id: trunk@55277 -
This commit is contained in:
ondrej 2017-06-09 11:13:20 +00:00
parent 78acf46651
commit 840c63cf14
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ide/environmentopts.pp
View File

@ -2683,7 +2683,8 @@ function TEnvironmentOptions.GetActiveDesktop: TDesktopOpt;
end; end;
var var
DefaultDesktop: TDesktopOpt; OldActiveDesktop: TDesktopOpt;
OldActiveDesktopName: string;
begin begin
if FActiveDesktopName <> '' then if FActiveDesktopName <> '' then
@ -2695,6 +2696,7 @@ begin
//the selected desktop is unsupported (docked/undocked) //the selected desktop is unsupported (docked/undocked)
// -> use default // -> use default
OldActiveDesktopName := FActiveDesktopName;
ChooseDefault; ChooseDefault;
Result := FDesktops.Find(FActiveDesktopName); Result := FDesktops.Find(FActiveDesktopName);
if Assigned(Result) and Result.Compatible then if Assigned(Result) and Result.Compatible then
@ -2703,15 +2705,17 @@ begin
//recreate desktop with ActiveDesktopName //recreate desktop with ActiveDesktopName
if Assigned(Result) then if Assigned(Result) then
FDesktops.Remove(Result); FDesktops.Remove(Result);
DefaultDesktop := FDesktops.Find('default');
Result := TDesktopOpt.Create(FActiveDesktopName); Result := TDesktopOpt.Create(FActiveDesktopName);
FDesktops.Add(Result); FDesktops.Add(Result);
Result.Assign(Desktop); Result.Assign(Desktop);
if Assigned(IDEDockMaster) then if Assigned(IDEDockMaster) then
Result.FDockedOpt.LoadDefaults; Result.FDockedOpt.LoadDefaults;
if Assigned(DefaultDesktop) then OldActiveDesktop := FDesktops.Find(OldActiveDesktopName);
Result.Assign(DefaultDesktop, False, False); if not Assigned(OldActiveDesktop) then
OldActiveDesktop := FDesktops.Find('default');
if Assigned(OldActiveDesktop) then
Result.Assign(OldActiveDesktop, False, False);
end; end;
procedure TEnvironmentOptions.SetTestBuildDirectory(const AValue: string); procedure TEnvironmentOptions.SetTestBuildDirectory(const AValue: string);