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

do not focus new control if notebook does not already have focus (issue #1455)

Browse Source 
git-svn-id: trunk@8195 -
This commit is contained in:
micha 2005-11-19 14:46:58 +00:00
parent f5ff9d9bd6
commit ba14a3e41f
2 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,7 +202,7 @@ Var
Flags := SW_HIDE;
Windows.ShowWindow(PageHandle, Flags);
if Showing then
NotebookTabChanged(Notebook, PageIndex);
NotebookFocusNewControl(Notebook, PageIndex);
end;
function GetMenuItemObject: TObject;

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

@ -215,22 +215,40 @@ type
public
end;
procedure NotebookTabChanged(Notebook: TCustomNotebook; NewIndex: integer);
procedure NotebookFocusNewControl(const ANotebook: TCustomNotebook; NewIndex: integer);
implementation
uses
LMessages;
function IsNotebookGroupFocused(const ANotebook: TCustomNotebook): boolean;
var
lNotebookHandle, lWindow: HWND;
begin
result := false;
if not ANotebook.HandleAllocated then exit;
lNotebookHandle := ANotebook.Handle;
lWindow := Windows.GetFocus;
while (lWindow <> 0) and (lWindow <> lNotebookHandle) do
lWindow := Windows.GetParent(lWindow);
if lWindow = 0 then exit;
result := true;
end;
{ sets focus to a control on the newly focused tab page }
procedure NotebookTabChanged(Notebook: TCustomNotebook; NewIndex: integer);
procedure NotebookFocusNewControl(const ANotebook: TCustomNotebook; NewIndex: integer);
var
Page: TCustomPage;
ControlList: TFPList;
lWinControl: TWinControl;
I: integer;
begin
Page := Notebook.CustomPage(NewIndex);
{ 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);
@ -469,30 +487,28 @@ end;
procedure TWin32WSCustomNotebook.SetPageIndex(const ANotebook: TCustomNotebook; const AIndex: integer);
var
OldPageIndex: Integer;
PageHandle: HWND;
Handle: HWND;
RealIndex: Integer;
PageHandle: HWND;
OldRealIndex, NewRealIndex: Integer;
begin
Handle := ANotebook.Handle;
OldPageIndex := SendMessage(Handle, TCM_GETCURSEL, 0, 0);
RealIndex := GetPageRealIndex(ANotebook,AIndex);
SendMessage(Handle, TCM_SETCURSEL, Windows.WParam(RealIndex), 0);
OldRealIndex := SendMessage(Handle, TCM_GETCURSEL, 0, 0);
NewRealIndex := GetPageRealIndex(ANotebook, AIndex);
SendMessage(Handle, TCM_SETCURSEL, Windows.WParam(NewRealIndex), 0);
if not (csDestroying in ANotebook.ComponentState) then
begin
// create handle if not already done, need to show!
if (AIndex >= 0) and (AIndex < ANotebook.PageCount) then
begin
NotebookTabChanged(ANotebook, AIndex);
PageHandle := ANotebook.CustomPage(AIndex).Handle;
SetWindowPos(PageHandle, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE or SWP_NOSIZE or SWP_SHOWWINDOW);
// send message
SendSelChangeMessage(ANotebook, Handle, AIndex);
NotebookFocusNewControl(ANotebook, AIndex);
end;
if (OldPageIndex >= 0) and (OldPageIndex<>AIndex)
and (OldPageIndex < ANotebook.PageCount)
and (ANotebook.CustomPage(OldPageIndex).HandleAllocated)
then ShowWindow(ANotebook.CustomPage(OldPageIndex).Handle, SW_HIDE);
if (OldRealIndex >= 0) and (OldRealIndex <> NewRealIndex)
and (OldRealIndex < ANotebook.PageCount)
and (ANotebook.CustomPage(OldRealIndex).HandleAllocated) then
ShowWindow(ANotebook.CustomPage(OldRealIndex).Handle, SW_HIDE);
end;
end;