paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-01 09:53:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

SpartaDockedFormEditor: Prevent showing of undocked new created frames (short flicker) and more generally code for revision 58299 #a027232dda.

Browse Source 
git-svn-id: trunk@58321 -
This commit is contained in:
michl 2018-06-19 07:53:06 +00:00
parent 6526cf39b0
commit ce6f326b14
3 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/ideintf/lazideintf.pas
View File

@ -570,7 +570,7 @@ type
function GetTabDisplayState: TTabDisplayState; virtual; abstract;
function GetTabDisplayStateEditor(Index: TSourceEditorInterface): TTabDisplayState; virtual; abstract;
public
function AutoSizeInShowDesigner(AForm: TCustomForm): Boolean; virtual; abstract;
function AutoSizeInShowDesigner(AControl: TControl): Boolean; virtual; abstract;
procedure ToggleFormUnit; virtual; abstract;
procedure JumpToCompilerMessage(ASourceEditor: TSourceEditorInterface); virtual; abstract;

40
components/sparta/dockedformeditor/source/sparta_mainide.pas
View File

@ -122,15 +122,15 @@ type
TDTXTabMaster = class(TIDETabMaster)
private
FAutoSizeFormList: TObjectList;
FAutoSizeControlList: TObjectList;
protected
function GetTabDisplayState: TTabDisplayState; override;
function GetTabDisplayStateEditor(Index: TSourceEditorInterface): TTabDisplayState; override;
public
constructor Create;
destructor Destroy; override;
function AutoSizeInShowDesigner(AForm: TCustomForm): Boolean; override;
procedure EnableAutoSizing(AForm: TCustomForm);
function AutoSizeInShowDesigner(AControl: TControl): Boolean; override;
procedure EnableAutoSizing(AControl: TControl);
procedure ToggleFormUnit; override;
procedure JumpToCompilerMessage(ASourceEditor: TSourceEditorInterface); override;
@ -795,31 +795,42 @@ end;
constructor TDTXTabMaster.Create;
begin
FAutoSizeFormList := TObjectList.Create(False);
FAutoSizeControlList := TObjectList.Create(False);
end;
destructor TDTXTabMaster.Destroy;
begin
FAutoSizeFormList.Free;
FAutoSizeControlList.Free;
inherited Destroy;
end;
function TDTXTabMaster.AutoSizeInShowDesigner(AForm: TCustomForm): Boolean;
function TDTXTabMaster.AutoSizeInShowDesigner(AControl: TControl): Boolean;
begin
FAutoSizeFormList.Add(AForm);
FAutoSizeControlList.Add(AControl);
Result := True;
end;
procedure TDTXTabMaster.EnableAutoSizing(AForm: TCustomForm);
procedure TDTXTabMaster.EnableAutoSizing(AControl: TControl);
var
AIndex: Integer;
AutoSizeControl: TControl;
begin
AIndex := FAutoSizeFormList.IndexOf(AForm);
if Assigned(AForm) and (AIndex >= 0) and IsFormDesign(AForm)
and (not (AForm is TNonControlProxyDesignerForm)) and (not (AForm is TFrameProxyDesignerForm)) then
if not Assigned(AControl) then Exit;
AutoSizeControl := nil;
if AControl is TNonFormProxyDesignerForm then
begin
FAutoSizeFormList.Delete(AIndex);
AForm.EnableAutoSizing{$IFDEF DebugDisableAutoSizing}('TAnchorDockMaster Delayed'){$ENDIF};
if (TNonFormProxyDesignerForm(AControl).LookupRoot is TControl) then
AutoSizeControl := TControl(TNonFormProxyDesignerForm(AControl).LookupRoot);
end
else
AutoSizeControl := AControl;
AIndex := FAutoSizeControlList.IndexOf(AutoSizeControl);
if (AIndex >= 0) then
begin
FAutoSizeControlList.Delete(AIndex);
AutoSizeControl.EnableAutoSizing{$IFDEF DebugDisableAutoSizing}('TAnchorDockMaster Delayed'){$ENDIF};
end;
end;
@ -880,8 +891,7 @@ end;
{ TDTXComponentsMaster }
function TDTXComponentsMaster.DrawNonVisualComponents(ALookupRoot: TComponent
): Boolean;
function TDTXComponentsMaster.DrawNonVisualComponents(ALookupRoot: TComponent): Boolean;
var
LFormData: TDesignFormData;
LPageCtrl: TModulePageControl;

6
ide/sourcefilemanager.pas
View File

@ -2295,9 +2295,9 @@ begin
begin
// disable autosizing for docked form editor forms, see issue #32207
PreventAutoSize := (IDETabMaster <> nil)
and (NewUnitInfo.Component is TCustomForm)
and (IsFormDesign(NewUnitInfo.Component as TCustomForm))
and IDETabMaster.AutoSizeInShowDesigner(NewUnitInfo.Component as TCustomForm);
and ((NewUnitInfo.Component is TCustomForm)
or (NewUnitInfo.Component is TCustomFrame))
and IDETabMaster.AutoSizeInShowDesigner(TControl(NewUnitInfo.Component));
if not PreventAutoSize then
TControl(NewUnitInfo.Component).EnableAutoSizing{$IFDEF DebugDisableAutoSizing}('TAnchorDockMaster Delayed'){$ENDIF};
end;