mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-08-18 07:39:22 +02:00
fixed keeping TForm.Visible=false
git-svn-id: trunk@3105 -
This commit is contained in:
parent
04b92e2696
commit
e752c14286
26
ide/main.pp
26
ide/main.pp
@ -625,6 +625,7 @@ type
|
|||||||
procedure CreateDesignerForComponent(AComponent: TComponent);
|
procedure CreateDesignerForComponent(AComponent: TComponent);
|
||||||
procedure InvalidateAllDesignerForms;
|
procedure InvalidateAllDesignerForms;
|
||||||
procedure UpdateIDEComponentPalette;
|
procedure UpdateIDEComponentPalette;
|
||||||
|
procedure ShowDesignerForm(AForm: TCustomForm);
|
||||||
|
|
||||||
// editor and environment options
|
// editor and environment options
|
||||||
procedure SaveEnvironment; override;
|
procedure SaveEnvironment; override;
|
||||||
@ -2043,6 +2044,13 @@ begin
|
|||||||
IDEComponentPalette.ShowHideControls(ShowControlsInComponentalette);
|
IDEComponentPalette.ShowHideControls(ShowControlsInComponentalette);
|
||||||
end;
|
end;
|
||||||
|
|
||||||
|
procedure TMainIDE.ShowDesignerForm(AForm: TCustomForm);
|
||||||
|
begin
|
||||||
|
// do not call 'AForm.Show', because it will set Visible to true
|
||||||
|
AForm.BringToFront;
|
||||||
|
LCLLinux.ShowWindow(AForm.Handle,SW_SHOWNORMAL);
|
||||||
|
end;
|
||||||
|
|
||||||
procedure TMainIDE.SetToolStatus(const AValue: TIDEToolStatus);
|
procedure TMainIDE.SetToolStatus(const AValue: TIDEToolStatus);
|
||||||
begin
|
begin
|
||||||
inherited SetToolStatus(AValue);
|
inherited SetToolStatus(AValue);
|
||||||
@ -4611,7 +4619,10 @@ Begin
|
|||||||
end;
|
end;
|
||||||
if AForm=nil then
|
if AForm=nil then
|
||||||
AForm:=SourceNotebook;
|
AForm:=SourceNotebook;
|
||||||
AForm.ShowOnTop;
|
if csDesigning in AForm.ComponentState then
|
||||||
|
ShowDesignerForm(AForm)
|
||||||
|
else
|
||||||
|
AForm.ShowOnTop;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
finally
|
finally
|
||||||
@ -6432,7 +6443,8 @@ begin
|
|||||||
// hide all collected windows
|
// hide all collected windows
|
||||||
for i:=0 to HiddenWindowsOnRun.Count-1 do begin
|
for i:=0 to HiddenWindowsOnRun.Count-1 do begin
|
||||||
AForm:=TCustomForm(HiddenWindowsOnRun[i]);
|
AForm:=TCustomForm(HiddenWindowsOnRun[i]);
|
||||||
AForm.Hide;
|
if not (csDesigning in ComponentState) then
|
||||||
|
AForm.Hide;
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
|
|
||||||
@ -6456,7 +6468,10 @@ var
|
|||||||
begin
|
begin
|
||||||
while HiddenWindowsOnRun.Count>0 do begin
|
while HiddenWindowsOnRun.Count>0 do begin
|
||||||
AForm:=TCustomForm(HiddenWindowsOnRun[0]);
|
AForm:=TCustomForm(HiddenWindowsOnRun[0]);
|
||||||
AForm.Show;
|
if (csDesigning in ComponentState) then
|
||||||
|
ShowDesignerForm(AForm)
|
||||||
|
else
|
||||||
|
AForm.Show;
|
||||||
HiddenWindowsOnRun.Delete(0);
|
HiddenWindowsOnRun.Delete(0);
|
||||||
end;
|
end;
|
||||||
end;
|
end;
|
||||||
@ -6501,7 +6516,7 @@ begin
|
|||||||
if AForm=nil then exit;
|
if AForm=nil then exit;
|
||||||
FDisplayState:= dsForm;
|
FDisplayState:= dsForm;
|
||||||
FLastFormActivated:=AForm;
|
FLastFormActivated:=AForm;
|
||||||
AForm.ShowOnTop;
|
ShowDesignerForm(AForm);
|
||||||
if TheControlSelection.SelectionForm<>AForm then begin
|
if TheControlSelection.SelectionForm<>AForm then begin
|
||||||
// select the new form (object inspector, formeditor, control selection)
|
// select the new form (object inspector, formeditor, control selection)
|
||||||
TheControlSelection.AssignComponent(ActiveUnitInfo.Component);
|
TheControlSelection.AssignComponent(ActiveUnitInfo.Component);
|
||||||
@ -9143,6 +9158,9 @@ end.
|
|||||||
|
|
||||||
{ =============================================================================
|
{ =============================================================================
|
||||||
$Log$
|
$Log$
|
||||||
|
Revision 1.605 2003/06/16 22:47:19 mattias
|
||||||
|
fixed keeping TForm.Visible=false
|
||||||
|
|
||||||
Revision 1.604 2003/06/13 21:21:09 mattias
|
Revision 1.604 2003/06/13 21:21:09 mattias
|
||||||
added tcolorbutton xpm
|
added tcolorbutton xpm
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user