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

win32: cleanup GetLCLClientBoundsOffset. remove check for scrollbar fields if RedirectDestroyMessages defined

Browse Source 
git-svn-id: trunk@34380 -
This commit is contained in:
blikblum 2011-12-24 12:24:26 +00:00
parent 89dd7c918b
commit a2141d47cb
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lcl/interfaces/win32/win32proc.pp
View File

@ -626,8 +626,7 @@ begin
end;
{-------------------------------------------------------------------------------
function GetLCLClientOriginOffset(Sender: TObject;
var LeftOffset, TopOffset: integer): boolean;
function GetLCLClientBoundsOffset(Sender: TObject; out ORect: TRect): boolean;
Returns the difference between the client origin of a win32 handle
and the definition of the LCL counterpart.
@ -639,19 +638,25 @@ end;
-------------------------------------------------------------------------------}
function GetLCLClientBoundsOffset(Sender: TObject; out ORect: TRect): boolean;
var
TM: TextMetricA;
TM: Windows.TextMetric;
DC: HDC;
Handle: HWND;
TheWinControl: TWinControl;
TheWinControl: TWinControl absolute Sender;
ARect: TRect;
begin
Result := False;
if (Sender = nil) or (not (Sender is TWinControl)) then exit;
TheWinControl := TWinControl(Sender);
if not (Sender is TWinControl) then exit;
if not TheWinControl.HandleAllocated then exit;
Handle := TheWinControl.Handle;
FillChar(ORect, SizeOf(ORect), 0);
if TheWinControl is TScrollingWinControl then
begin
{$ifdef RedirectDestroyMessages}
with TScrollingWinControl(TheWinControl) do
begin
OffsetRect(ORect, -HorzScrollBar.Position, -VertScrollBar.Position);
end;
{$else}
with TScrollingWinControl(TheWinControl) do
begin
if HorzScrollBar <> nil then
@ -667,6 +672,8 @@ begin
ORect.Bottom := -VertScrollBar.Position;
end;
end;
{$endif}
end else
if (TheWinControl is TCustomGroupBox) then
begin
// The client area of a groupbox under winapi is the whole size, including
@ -674,7 +681,7 @@ begin
// -> Adjust the position
// add the upper frame with the caption
DC := Windows.GetDC(Handle);
GetTextMetrics(DC, TM);
Windows.GetTextMetrics(DC, TM);
ORect.Top := TM.TMHeight;
Windows.ReleaseDC(Handle, DC);
// add the left, right and bottom frame borders