paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-06-25 21:08:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

win32: rewrite focusing while pages switching (bug #0012959)

Browse Source 
git-svn-id: trunk@18233 -
This commit is contained in:
paul 2009-01-10 12:55:04 +00:00
parent 11f5a2759a
commit f7eda562c6
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
lcl/interfaces/win32/win32wsextctrls.pp
View File

@ -226,36 +226,27 @@ end;
procedure NotebookFocusNewControl(const ANotebook: TCustomNotebook; NewIndex: integer);
var
Page: TCustomPage;
ControlList: TFPList;
lWinControl: TWinControl;
I: integer;
FocusSet: Boolean;
AWinControl: TWinControl;
ParentForm: TCustomForm;
begin
{ see if currently focused control is within notebook }
if not IsNotebookGroupFocused(ANotebook) then exit;
{ focus was/is within notebook, pick a new control to focus }
Page := ANotebook.CustomPage(NewIndex);
ControlList := TFPList.Create;
try
Page.GetTabOrderList(ControlList);
I := 0;
FocusSet := False;
while I < ControlList.Count do
ParentForm := GetParentForm(ANotebook);
if ParentForm <> nil then
begin
if ANotebook.ContainsControl(ParentForm.ActiveControl) and (ParentForm.ActiveControl <> ANotebook) then
begin
lWinControl := TWinControl(ControlList[I]);
if lWinControl.TabStop and lWinControl.Enabled and lWinControl.CanFocus then
begin
lWinControl.SetFocus;
FocusSet := True;
break;
end;
Inc(I);
AWinControl := nil;
if Page.CanFocus then
AWinControl := TCustomPageAccess(Page).FindNextControl(nil, True, True, False);
// if nothing to focus then focus notebook then we can traverse pages by keys
if AWinControl = nil then
AWinControl := ANotebook;
AWinControl.SetFocus;
end;
if not FocusSet then
Page.SetFocus;
finally
ControlList.Free;
end;
end;