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

lcl: redo TForm.ActiveControl change in designer fix (28305).

Browse Source 
git-svn-id: trunk@28389 -
This commit is contained in:
paul 2010-11-22 03:01:28 +00:00
parent 04eb05df31
commit 17652a37b3
2 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
lcl/include/customform.inc
View File

@ -174,12 +174,12 @@ begin
opRemove:
begin
// first clean up references
if FActiveControl=AComponent then
if FActiveControl = AComponent then
begin
{$IFDEF VerboseFocus}
debugln('TCustomForm.Notification opRemove FActiveControl=',DbgSName(AComponent));
{$ENDIF}
FActiveControl:=nil;
FActiveControl := nil;
end;
if AComponent = FDefaultControl then
FDefaultControl := nil;
@ -1729,7 +1729,7 @@ end;
procedure TCustomForm.SetActiveControl(AWinControl: TWinControl);
begin
if FActiveControl = AWinControl then exit;
if (AWinControl<>nil) and IsVisible then
if Assigned(AWinControl) and IsVisible then
begin
// this form can focus => do some sanity checks and raise an exception to
// to help programmers to understand why a control is not focused
@ -1752,9 +1752,8 @@ begin
{$IFDEF VerboseFocus}
Debugln(['TCustomForm.SetActiveControl ',DbgSName(Self),' FActive=',DbgS(FActive),' OldActiveControl=',DbgSName(FActiveControl),' NewActiveControl=',DbgSName(AWinControl)]);
{$ENDIF}
FActiveControl := AWinControl;
if FActiveControl<>nil then FreeNotification(FActiveControl);
if Assigned(FActiveControl) then FreeNotification(FActiveControl);
if ([csLoading, csDestroying] * ComponentState = []) then
begin
if FActive then
@ -2259,7 +2258,6 @@ function TCustomForm.SetFocusedControl(Control: TWinControl): Boolean;
var
ParentForm: TCustomForm;
CurControl: TWinControl;
begin
LastFocusedControl := Control;
Result := False;
@ -2277,7 +2275,7 @@ begin
end;
// update FActiveControl
if (FDesigner = nil) and (not (csLoading in ComponentState)) then
if ([csLoading, csDesigning] * ComponentState = []) then
begin
if Control <> Self then
begin
@ -2325,20 +2323,6 @@ begin
try
if not Screen.SetFocusedForm(Self) then
Exit;
// update ActiveControls of all parent forms
CurControl := Control.Parent;
while CurControl <> nil do
begin
if CurControl is TCustomForm then begin
{$IFDEF VerboseFocus}
if TCustomForm(CurControl).FActiveControl<>Control then
debugln(['TCustomForm.SetFocusedControl Self=',DbgSName(Self),' SomeParent=',DbgSName(CurControl),' OldActiveControl=',DbgSName(TCustomForm(CurControl).FActiveControl),' New=',DbgSName(Control)]);
{$ENDIF}
TCustomForm(CurControl).FActiveControl := Control;
TCustomForm(CurControl).FreeNotification(Control);
end;
CurControl := CurControl.Parent;
end;
Result := SendEnterExitLoop;
finally
Control.ControlState := Control.ControlState - [csFocusing];
@ -2511,7 +2495,7 @@ begin
finally
EnableAlign;
end;
if (ActiveControl <> nil) and (Parent=nil) then
if (ActiveControl <> nil) and (Parent = nil) then
begin
// check if loaded ActiveControl can be focused
// and if yes, call SetActiveControl to invoke handlers

3
lcl/include/wincontrol.inc
View File

@ -5164,8 +5164,7 @@ begin
DebugLn('TWinControl.WndProc LM_SetFocus ',DbgSName(Self));
{$ENDIF}
Form := GetParentForm(Self);
if Assigned(Form) and not (csDesigning in Form.ComponentState) and
not (csDestroyingHandle in ControlState) and not (csDestroying in ComponentState) then
if Assigned(Form) and not (csDestroyingHandle in ControlState) and not (csDestroying in ComponentState) then
begin
if not Form.SetFocusedControl(Self) then Exit;
Message.Result := 0;