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

fix notebook page indexing when TabVisible is false for some page

Browse Source 
git-svn-id: trunk@9624 -
This commit is contained in:
micha 2006-07-17 18:20:25 +00:00
parent ed52351960
commit 3742d8f5be
2 changed files with 34 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -217,7 +217,7 @@ Var
DrawListItemStruct: TDrawListItemStruct; //used by WM_DRAWITEM
CancelEndSession : Boolean;//use by WM_QUERYENDSESSION
procedure ShowHideTabPage(NotebookHandle: HWnd; Showing: boolean);
function ShowHideTabPage(NotebookHandle: HWnd; Showing: boolean): integer;
var
NoteBook: TCustomNotebook;
PageIndex, Flags: Integer;
@ -225,6 +225,7 @@ Var
begin
Notebook := GetWindowInfo(NotebookHandle)^.WinControl as TCustomNotebook;
PageIndex := Windows.SendMessage(NotebookHandle, TCM_GETCURSEL, 0, 0);
PageIndex := NotebookPageRealToLCLIndex(Notebook, PageIndex);
if PageIndex = -1 then exit;
PageHandle := Notebook.CustomPage(PageIndex).Handle;
if Showing then
@ -232,8 +233,10 @@ Var
else
Flags := SW_HIDE;
Windows.ShowWindow(PageHandle, Flags);
Windows.RedrawWindow(PageHandle, nil, 0, RDW_INVALIDATE or RDW_ALLCHILDREN or RDW_ERASE);
if Showing then
NotebookFocusNewControl(Notebook, PageIndex);
Result := PageIndex;
end;
function GetMenuItemObject: TObject;
@ -1491,10 +1494,7 @@ Begin
TCN_SELCHANGING:
ShowHideTabPage(HWndFrom, False);
TCN_SELCHANGE:
begin
ShowHideTabPage(HWndFrom, True);
idFrom := Windows.SendMessage(HWndFrom, TCM_GETCURSEL, 0, 0);
end;
idFrom := ShowHideTabPage(HWndFrom, true);
end;
end;
end;

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

@ -216,6 +216,7 @@ type
end;
procedure NotebookFocusNewControl(const ANotebook: TCustomNotebook; NewIndex: integer);
function NotebookPageRealToLCLIndex(const ANotebook: TCustomNotebook; AIndex: integer): integer;
implementation
@ -270,6 +271,19 @@ begin
end;
end;
function NotebookPageRealToLCLIndex(const ANotebook: TCustomNotebook; AIndex: integer): integer;
var
I: Integer;
begin
Result := AIndex;
if csDesigning in ANotebook.ComponentState then exit;
I := 0;
while (I < ANotebook.PageCount) and (I <= Result) do
begin
if not ANotebook.Page[I].TabVisible then Inc(Result);
Inc(I);
end;
end;
{ TWin32WSCustomPage }
@ -394,24 +408,28 @@ end;
class procedure TWin32WSCustomNotebook.AddAllNBPages(const ANotebook: TCustomNotebook);
var
TCI: TC_ITEM;
I, Res: Integer;
I, Res, RealIndex: Integer;
lPage: TCustomPage;
WinHandle: HWND;
begin
WinHandle := ANotebook.Handle;
RealIndex := 0;
for I := 0 to ANotebook.PageCount - 1 do
begin
lPage := ANotebook.Page[I];
if not lPage.TabVisible and not (csDesigning in lPage.ComponentState) then
continue;
// check if already shown
TCI.Mask := TCIF_PARAM;
Res := Windows.SendMessage(ANotebook.Handle, TCM_GETITEM, I, LPARAM(@TCI));
Res := Windows.SendMessage(ANotebook.Handle, TCM_GETITEM, RealIndex, LPARAM(@TCI));
if (Res = 0) or (PtrUInt(TCI.lParam) <> PtrUInt(lPage)) then
begin
TCI.Mask := TCIF_TEXT or TCIF_PARAM;
TCI.pszText := PChar(lPage.Caption);
TCI.lParam := PtrUInt(lPage);
Windows.SendMessage(WinHandle, TCM_INSERTITEM, I, LPARAM(@TCI));
Windows.SendMessage(WinHandle, TCM_INSERTITEM, RealIndex, LPARAM(@TCI));
end;
Inc(RealIndex);
end;
AdjustSizeNotebookPages(ANotebook);
end;
@ -457,13 +475,12 @@ end;
class function TWin32WSCustomNotebook.GetPageRealIndex(const ANotebook: TCustomNotebook; AIndex: Integer): Integer;
var
X: Integer;
X: Integer;
begin
Result := AIndex;
if csDesigning in ANotebook.ComponentState then exit;
for X := 0 to AIndex-1 do begin
for X := 0 to AIndex-1 do
if ANotebook.Page[X].TabVisible = False then Dec(Result);
end;
end;
procedure SendSelChangeMessage(const ANotebook: TCustomNotebook; const AHandle: HWND;
@ -496,10 +513,11 @@ class procedure TWin32WSCustomNotebook.SetPageIndex(const ANotebook: TCustomNote
var
Handle: HWND;
PageHandle: HWND;
OldRealIndex, NewRealIndex: Integer;
OldIndex, OldRealIndex, NewRealIndex: Integer;
begin
Handle := ANotebook.Handle;
OldRealIndex := SendMessage(Handle, TCM_GETCURSEL, 0, 0);
OldIndex := NotebookPageRealToLCLIndex(ANotebook, OldRealIndex);
NewRealIndex := GetPageRealIndex(ANotebook, AIndex);
SendMessage(Handle, TCM_SETCURSEL, Windows.WParam(NewRealIndex), 0);
if not (csDestroying in ANotebook.ComponentState) then
@ -512,10 +530,10 @@ begin
SendSelChangeMessage(ANotebook, Handle, AIndex);
NotebookFocusNewControl(ANotebook, AIndex);
end;
if (OldRealIndex >= 0) and (OldRealIndex <> NewRealIndex)
and (OldRealIndex < ANotebook.PageCount)
and (ANotebook.CustomPage(OldRealIndex).HandleAllocated) then
ShowWindow(ANotebook.CustomPage(OldRealIndex).Handle, SW_HIDE);
if (OldIndex >= 0) and (OldIndex <> AIndex)
and (OldIndex < ANotebook.PageCount)
and (ANotebook.CustomPage(OldIndex).HandleAllocated) then
ShowWindow(ANotebook.CustomPage(OldIndex).Handle, SW_HIDE);
end;
end;