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

LCL: TCustomForm: not calling LCLIntf.SetFocus if Parent<>nil, choosing a default for ActiveControl in TCustomForm.WndProc

Browse Source 
git-svn-id: trunk@13131 -
This commit is contained in:
mattias 2007-12-03 21:30:32 +00:00
parent 03acdb2c29
commit d01719fc58
3 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/forms.pp
View File

@ -434,6 +434,7 @@ type
const Handler: TMethod; AsLast: Boolean);
procedure RemoveHandler(HandlerType: TFormHandlerType;
const Handler: TMethod);
function FindDefaultForActiveControl: TWinControl;
protected
FFormBorderStyle: TFormBorderStyle;
FActionLists: TList;

66
lcl/include/customform.inc
View File

@ -374,29 +374,6 @@ end;
ShowWindow event handler.
------------------------------------------------------------------------------}
procedure TCustomForm.WMShowWindow(var message: TLMShowWindow);
function FindFirstControl: TWinControl;
var
List: TFPList;
I: Integer;
begin
List := TFPList.Create;
Result := nil;
try
GetTabOrderList(List);
for I := 0 to List.Count - 1 do
begin
if TObject(List.Items[0]) is TWinControl then
begin
Result := TWinControl(List.Items[0]);
exit;
end;
end;
finally
List.Free;
end;
end;
begin
{$IFDEF VerboseFocus}
DbgOut('TCustomForm.WMShowWindow A ',Name,':'+ClassName+' fsShowing='+dbgs(fsShowing in FFormState)+' Msg.Show='+dbgs(Message.Show));
@ -416,16 +393,18 @@ begin
if Message.Show then begin
if (FActiveControl = nil) and (Parent=nil) then begin
// automatically choose a control to focus
FActiveControl := FindFirstControl;
SetFocusedControl(FindDefaultForActiveControl);
{$IFDEF VerboseFocus}
DebugLn('TCustomForm.WMShowWindow Set FActiveControl := FindFirstControl = ',DbgSName(FActiveControl));
DebugLn('TCustomForm.WMShowWindow Set FActiveControl := ',DbgSName(FActiveControl));
{$ENDIF}
end;
if ([csLoading,csDestroying]*ComponentState=[])
and (Parent=nil)
and (FActiveControl<>nil) and FActiveControl.HandleAllocated
and FActiveControl.Visible and FActiveControl.Enabled then begin
and FActiveControl.Visible and FActiveControl.Enabled
then begin
{$IFDEF VerboseFocus}
DebugLn('TCustomForm.WMShowWindow SetFocus ',DbgSName(FActiveControl));
DebugLn('TCustomForm.WMShowWindow ',DbgSName(Self),' SetFocus ',DbgSName(FActiveControl));
{$ENDIF}
LCLIntf.SetFocus(FActiveControl.Handle);
end;
@ -613,6 +592,28 @@ begin
FFormHandlers[HandlerType].Remove(Handler);
end;
function TCustomForm.FindDefaultForActiveControl: TWinControl;
var
List: TFPList;
I: Integer;
begin
List := TFPList.Create;
Result := nil;
try
GetTabOrderList(List);
for I := 0 to List.Count - 1 do
begin
if TObject(List.Items[0]) is TWinControl then
begin
Result := TWinControl(List.Items[0]);
exit;
end;
end;
finally
List.Free;
end;
end;
{------------------------------------------------------------------------------
Method: TCustomForm.DefocusControl
Params: Control: the control which is to be defocused
@ -884,6 +885,14 @@ begin
//DebugLn(['TCustomForm.WndProc ',DbgSName(Self),' FActiveControl=',DbgSName(FActiveControl)]);
FocusHandle := 0;
if (FActiveControl = nil) and (Parent=nil) then begin
// automatically choose a control to focus
SetFocusedControl(FindDefaultForActiveControl);
{ $IFDEF VerboseFocus}
DebugLn('TCustomForm.WndProc Set FActiveControl := ',DbgSName(FActiveControl));
{ $ENDIF}
end;
if FormStyle = fsMDIFORM then
begin
// ToDo
@ -1754,7 +1763,8 @@ begin
// activate focus if visible
if Visible then begin
if (FActiveControl<>nil) and FActiveControl.HandleAllocated
if (Parent=nil)
and (FActiveControl<>nil) and FActiveControl.HandleAllocated
and FActiveControl.Visible and FActiveControl.Enabled
and ([csLoading,csDestroying]*ComponentState=[]) then begin
{$IFDEF VerboseFocus}

2
lcl/interfaces/win32/win32winapi.inc
View File

@ -2974,6 +2974,8 @@ end;
------------------------------------------------------------------------------}
function TWin32WidgetSet.SetFocus(HWnd: HWND): HWND;
begin
//DebugLn(['TWin32WidgetSet.SetFocus ']);
//DumpStack;
Result := Windows.SetFocus(HWnd);
end;