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

fixed updating FLastFormActivated with TDataModule

Browse Source 
git-svn-id: trunk@7787 -
This commit is contained in:
mattias 2005-09-22 22:48:39 +00:00
parent 6b349795d0
commit be8123b7f1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ide/main.pp
View File

@ -5253,7 +5253,10 @@ begin
Result:=mrCancel;
GetUnitWithPageIndex(PageIndex,ActiveSrcEdit,ActiveUnitInfo);
if ActiveUnitInfo=nil then exit;
if ActiveUnitInfo.Component=FLastFormActivated then
if (ActiveUnitInfo.Component<>nil)
and (FLastFormActivated<>nil)
and (TDesigner(FLastFormActivated.Designer).LookupRoot=ActiveUnitInfo.Component)
then
FLastFormActivated:=nil;
// save some meta data of the source
@ -8565,7 +8568,8 @@ var
begin
if SourceNoteBook.NoteBook = nil then exit;
if FLastFormActivated <> nil then begin
ActiveUnitInfo:= Project1.UnitWithComponent(FLastFormActivated);
ActiveUnitInfo:= Project1.UnitWithComponent(
TDesigner(FLastFormActivated.Designer).LookupRoot);
if (ActiveUnitInfo <> nil) and (ActiveUnitInfo.EditorIndex >= 0) then
begin
SourceNotebook.Notebook.PageIndex:= ActiveUnitInfo.EditorIndex;
@ -10993,7 +10997,7 @@ end;
Procedure TMainIDE.OnDesignerActivated(Sender: TObject);
begin
FDisplayState:= dsForm;
FLastFormActivated := TDesigner(Sender).Form;
FLastFormActivated := (Sender as TDesigner).Form;
UpdateIDEComponentPalette;
end;