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

sparta: revert r55595 #8777025cc5 (problem with design raster)

Browse Source 
git-svn-id: trunk@55596 -
This commit is contained in:
hnb 2017-07-26 21:31:14 +00:00
parent 8777025cc5
commit 3f55ac31b9
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ide/main.pp
View File

@ -391,7 +391,6 @@ type
UpdatePackageCommandsStamp: TPackageCommandsStamp;
UpdateBookmarkCommandsStamp: TBookmarkCommandsStamp;
BookmarksStamp: Int64;
IsDockedFormEditor: Boolean;
public
procedure UpdateMainIDECommands(Sender: TObject);
procedure UpdateFileCommands(Sender: TObject);
@ -1566,7 +1565,7 @@ begin
CompPalette.OnChangeActivePage:=@MainIDEBar.SetMainIDEHeightEvent;
// load installed packages
PkgBoss.LoadInstalledPackages;
IsDockedFormEditor := IDETabMaster <> nil;
EditorMacroListViewer.LoadGlobalInfo; // Must be after packages are loaded/registered.
FormEditor1.RegisterFrame;
@ -3542,17 +3541,8 @@ begin
exit;
end;
// do not call 'AForm.Show', because it will set Visible to true
if IsDockedFormEditor then
begin
ARestoreVisible := AForm.Visible;
AForm.Visible := False;
AForm.Visible := ARestoreVisible;
end
else
begin
AForm.BringToFront;
LCLIntf.ShowWindow(AForm.Handle,SW_SHOWNORMAL);
end;
AForm.BringToFront;
LCLIntf.ShowWindow(AForm.Handle,SW_SHOWNORMAL);
end;
procedure TMainIDE.DoViewAnchorEditor(State: TIWGetFormState);
@ -8452,11 +8442,7 @@ var
begin
DoShowDesignerFormOfSrc(SourceEditorManager.ActiveEditor, LForm);
if LForm <> nil then
begin
if IsDockedFormEditor then
LCLIntf.ShowWindow(LForm.Handle, SW_MINIMIZE);
DoCallShowDesignerFormOfSourceHandler(lihtShowDesignerFormOfSource, LForm, SourceEditorManager.ActiveEditor, AComponentPaletteClassSelected);
end;
end;
procedure TMainIDE.DoShowDesignerFormOfSrc(AEditor: TSourceEditorInterface);