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

lcl: fix ControlAtPos when it search recursively by Martin Friebe (issue #0014256)

Browse Source 
git-svn-id: trunk@26660 -
This commit is contained in:
paul 2010-07-15 06:25:51 +00:00
parent 80c3026e14
commit b18be4646a
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lcl/include/wincontrol.inc
View File

@ -3831,21 +3831,20 @@ var
begin
Result.X := 0;
Result.Y := 0;
//DebugLn('[TWinControl.GetClientOrigin] ',Name,':',ClassName,' ',Handle);
if HandleAllocated then begin
if HandleAllocated then
begin
// get the interface idea where the client area is on the screen
LCLIntf.ClientToScreen(Handle,Result);
LCLIntf.ClientToScreen(Handle, Result);
// adjust the result by all bounds, that are not yet sent to the interface
AControl:=Self;
AControl := Self;
repeat
inc(Result.X,AControl.Left-AControl.FBoundsRealized.Left);
inc(Result.Y,AControl.Top-AControl.FBoundsRealized.Top);
AControl:=AControl.Parent;
until AControl=nil;
inc(Result.X, AControl.Left - AControl.FBoundsRealized.Left);
inc(Result.Y, AControl.Top - AControl.FBoundsRealized.Top);
AControl := AControl.Parent;
until AControl = nil;
end else
if Parent <> nil then
Result:=inherited GetClientOrigin;
Assert(False, Format('Trace:[TWinControl.GetClientOrigin] %s --> (%d, %d)', [Classname, Result.X, Result.Y]));
Result := inherited GetClientOrigin;
end;
{-------------------------------------------------------------------------------
@ -5020,12 +5019,14 @@ begin
if (capfRecursive in Flags) and (Result is TWinControl) and
(TWinControl(Result).ControlCount > 0) then
begin
// in LCL ClientOrigin contains the scroll offset. At least this is so
// for win32 and gtk2
OldClientOrigin := ClientOrigin;
NewClientOrigin := TWinControl(Result).ClientOrigin;
NewPos := Pos;
NewPos.X := NewPos.X - NewClientOrigin.X + OldClientOrigin.X;
NewPos.Y := NewPos.Y - NewClientOrigin.Y + OldClientOrigin.Y;
LControl := TWinControl(Result).ControlAtPos(NewPos, Flags - [capfHasScrollOffset]);
LControl := TWinControl(Result).ControlAtPos(NewPos, Flags + [capfHasScrollOffset]);
//debugln(['TWinControl.RECURSED ControlAtPos Result=',DbgSName(Result),' LControl=',DbgSName(LControl),' ',dbgs(NewPos),' AllowDisabled=',AllowDisabled,' OnlyClientAreas=',OnlyClientAreas]);
if LControl <> nil then
Result := LControl;

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

@ -287,7 +287,7 @@ end;
Converts client coordinates to screen coordinates
------------------------------------------------------------------------------}
function TWin32WidgetSet.ClientToScreen(Handle: HWND; Var P: TPoint): Boolean;
function TWin32WidgetSet.ClientToScreen(Handle: HWND; var P: TPoint): Boolean;
var
ORect: TRect;
begin