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

LCL, grids: fixes MouseToGridZone which in some cases failed to return gzInvalid (related to r51914 #5224c3c339), fixes issue #29842

Browse Source 
git-svn-id: trunk@51980 -
This commit is contained in:
jesus 2016-03-17 21:15:58 +00:00
parent 88029919d6
commit 54cfaed2a6
1 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lcl/grids.pas
View File

@ -5715,12 +5715,12 @@ begin
Result:=false;
with FGCache do begin
if IsCol then begin
if index>ColCount-1 then
if (index<0) or (index>ColCount-1) then
exit;
StartPos:=integer(PtrUInt(AccumWidth[index]));
Dim:=GetColWidths(index);
end else begin
if index>RowCount-1 then
if (index<0) or (index>RowCount-1) then
exit;
StartPos:=integer(PtrUInt(AccumHeight[index]));
Dim:= GetRowHeights(index);
@ -5807,35 +5807,40 @@ end;
function TCustomGrid.MouseToGridZone(X, Y: Integer): TGridZone;
var
aBorderWidth: Integer;
aCol, aRow: Longint;
begin
aBorderWidth := GetBorderWidth;
if FlipX(X)<FGCache.FixedWidth+aBorderWidth then begin
// in fixedwidth zone
if Y<FGcache.FixedHeight+aBorderWidth then
Result:= gzFixedCells
else
if (RowCount>FixedRows) and (Y<=FGCache.GridHeight) then
Result:= gzFixedRows
else
Result:= gzInvalid
else begin
OffsetToColRow(False, True, Y, aRow, aCol);
if (aRow<0) or (RowCount<=FixedRows) then
Result := gzInvalid
else
Result := gzFixedRows;
end;
end
else if Y<FGCache.FixedHeight+aBorderWidth then begin
// if fixedheight zone
if FlipX(X)<FGCache.FixedWidth+aBorderWidth then
Result:=gzFixedCells
else
if (ColCount>FixedCols) and (FlipX(X)<=FGCache.GridWidth) then
Result:=gzFixedCols
else
Result:=gzInvalid
else begin
OffsetToColRow(True, True, X, aCol, aRow);
if (aCol<0) or (ColCount<=FixedCols) then
Result := gzInvalid
else
Result := gzFixedCols;
end;
end
else if not FixedGrid then begin
// in normal cell zone (though, might be outbounds)
if AllowOutboundEvents or
((FlipX(X)<=FGCache.GridWidth) and (Y<=FGCache.GridHeight)) then
result := gzNormal
else
MouseToCell(x, y, aCol, aRow);
if (aCol<0) or (aRow<0) then
result := gzInvalid
else
result := gzNormal;
end
else
result := gzInvalid;