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

fix clientrect in tnotebook (fixes #476 and #488)

Browse Source 
git-svn-id: trunk@6401 -
This commit is contained in:
micha 2004-12-21 11:46:28 +00:00
parent 339c87d92c
commit 34d6e4286a
1 changed files with 4 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,6 @@ type
class function CreateHandle(const AWinControl: TWinControl; class function CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): HWND; override; const AParams: TCreateParams): HWND; override;
class procedure UpdateProperties(const ACustomPage: TCustomPage); override; class procedure UpdateProperties(const ACustomPage: TCustomPage); override;
class procedure SetBounds(const AWinControl: TWinControl; const ALeft, ATop, AWidth, AHeight: Integer); override;
class procedure SetText(const AWinControl: TWinControl; const AText: string); override; class procedure SetText(const AWinControl: TWinControl; const AText: string); override;
end; end;
@ -274,20 +273,6 @@ end;
{ TWin32WSCustomPage } { TWin32WSCustomPage }
procedure CustomPageCalcBounds(const AWinControl: TWinControl;
var Left, Top, Width, Height: integer);
var
Rect, OffsetRect: TRect;
begin
// Adjust page size to fit in tabcontrol, need bounds of notebook in client of parent
Windows.GetClientRect(TCustomPage(AWinControl).Parent.Handle, @Rect);
GetLCLClientBoundsOffset(AWinControl.Parent, OffsetRect);
Left := OffsetRect.Left;
Top := OffsetRect.Top;
Width := Rect.Right + OffsetRect.Right - OffsetRect.Left - Rect.Left;
Height := Rect.Bottom + OffsetRect.Bottom - OffsetRect.Top - Rect.Top;
end;
function TWin32WSCustomPage.CreateHandle(const AWinControl: TWinControl; function TWin32WSCustomPage.CreateHandle(const AWinControl: TWinControl;
const AParams: TCreateParams): HWND; const AParams: TCreateParams): HWND;
var var
@ -301,7 +286,6 @@ begin
pClassName := @ClsName; pClassName := @ClsName;
Flags := Flags and not WS_VISIBLE; Flags := Flags and not WS_VISIBLE;
SubClassWndProc := nil; SubClassWndProc := nil;
CustomPageCalcBounds(AWinControl, Left, Top, Width, Height);
end; end;
// create window // create window
FinishCreateWindow(AWinControl, Params, false); FinishCreateWindow(AWinControl, Params, false);
@ -315,41 +299,6 @@ begin
end; end;
end; end;
procedure TWin32WSCustomPage.SetBounds(const AWinControl: TWinControl;
const ALeft, ATop, AWidth, AHeight: Integer);
var
lLeft, lTop, lWidth, lHeight: integer;
wLeft, wTop, wWidth, wHeight: integer;
PageRect, ParentRect: Windows.RECT;
WinHandle: HWND;
begin
// calculate bounds as we think it should be
CustomPageCalcBounds(AWinControl, wLeft, wTop, wWidth, wHeight);
// calculate current bounds of page
WinHandle := AWinControl.Handle;
GetWindowRect(WinHandle, @PageRect);
GetWindowRect(GetParent(WinHandle), @ParentRect);
OffsetRect(@PageRect, -ParentRect.Left, -ParentRect.Top);
// if differ, then update page to new bounds
if (wLeft <> PageRect.Left) or (wTop <> PageRect.Top)
or (wWidth <> (PageRect.Right - PageRect.Left))
or (wHeight <> (PageRect.Bottom - PageRect.Top)) then
begin
SetWindowPos(WinHandle, 0, wLeft, wTop, wWidth, wHeight, SWP_NOACTIVATE or SWP_NOZORDER);
end else begin
// calculate bounds as LCL thinks it should be
lLeft := ALeft; lTop := ATop;
lWidth := AWidth; lHeight := AHeight;
LCLBoundsToWin32Bounds(AWinControl, lLeft, lTop, lWidth, lHeight);
// if differ, then update LCL
if (lLeft <> wLeft) or (lTop <> wTop)
or (lWidth <> wWidth) or (lHeight <> wHeight) then
begin
LCLControlSizeNeedsUpdate(AWinControl, true);
end;
end;
end;
procedure TWin32WSCustomPage.SetText(const AWinControl: TWinControl; const AText: string); procedure TWin32WSCustomPage.SetText(const AWinControl: TWinControl; const AText: string);
var var
TCI: TC_ITEM; TCI: TC_ITEM;
@ -415,6 +364,10 @@ begin
// store object as extra, so we can verify we got the right page later // store object as extra, so we can verify we got the right page later
TCI.lParam := dword(AChild); TCI.lParam := dword(AChild);
Windows.SendMessage(Handle, TCM_INSERTITEM, AIndex, LPARAM(@TCI)); Windows.SendMessage(Handle, TCM_INSERTITEM, AIndex, LPARAM(@TCI));
// clientrect possible changed, adding first tab, or deleting last
// windows should send a WM_SIZE message because of this, but it doesn't
// send it ourselves
LCLControlSizeNeedsUpdate(ANotebook, true);
end; end;
end; end;