paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-12-08 01:57:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

LCL: Fix an error in TTreeView mouse selection + some refactoring. Issue #37145.

Browse Source 
git-svn-id: trunk@63235 -
This commit is contained in:
juha 2020-05-27 11:58:07 +00:00
parent 1e444d8398
commit 0d191847d7
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lcl/comctrls.pp
View File

@ -3634,6 +3634,7 @@ type
procedure EraseBackground(DC: HDC); override;
function GetHitTestInfoAt(X, Y: Integer): THitTests;
function GetNodeAt(X, Y: Integer): TTreeNode;
function GetNodeWithExpandSignAt(X, Y: Integer): TTreeNode;
procedure GetInsertMarkAt(X, Y: Integer; out AnInsertMarkNode: TTreeNode;
out AnInsertMarkType: TTreeViewInsertMarkType);
procedure SetInsertMark(AnInsertMarkNode: TTreeNode;

36
lcl/include/treeview.inc
View File

@ -3974,15 +3974,30 @@ begin
end;
function TCustomTreeView.GetNodeAt(X, Y: Integer): TTreeNode;
var
b: Boolean;
begin
Result := GetNodeAtY(Y);
if Result = nil then Exit;
if (not (tvoRowSelect in Options) and
((X < Result.DisplayStateIconLeft) or (X >= Result.DisplayTextRight)))
or
((tvoRowSelect in Options) and // row select
((X < BorderWidth) or (X >= ClientWidth - BorderWidth)))
then
if tvoRowSelect in Options then // row select
b := (X < BorderWidth) or (X >= ClientWidth - BorderWidth)
else
b := (X < Result.DisplayStateIconLeft) or (X >= Result.DisplayTextRight);
if b then
Result := nil;
end;
function TCustomTreeView.GetNodeWithExpandSignAt(X, Y: Integer): TTreeNode;
var
b: Boolean;
begin
Result := GetNodeAtY(Y);
if Result = nil then Exit;
if tvoRowSelect in Options then // row select
b := (X < BorderWidth) or (X >= ClientWidth - BorderWidth)
else // need to include DisplayExpandSignLeft
b := (X < Result.DisplayExpandSignLeft) or (X >= Result.DisplayTextRight);
if b then
Result := nil;
end;
@ -5632,7 +5647,7 @@ begin
inherited MouseDown(Button, Shift, X, Y);
//CursorNode must be reassigned again - e.g. in OnMouseDown the node can be deleted or moved.
CursorNode := GetNodeAt(LogicalX, Y);
CursorNode := GetNodeWithExpandSignAt(LogicalX, Y);
CursorNdSelected := NodeIsSelected(CursorNode);
//Flag is used for DblClick/TripleClick/QuadClick, so set it before testing ShiftState
@ -5642,15 +5657,14 @@ begin
(LogicalX < CursorNode.DisplayExpandSignRight);
//change selection on left click
if (Button = mbLeft) and//left click
(([ssDouble, ssTriple, ssQuad] * Shift) = []) and//single or first of a multi click
if (Button = mbLeft) and //left click
(([ssDouble, ssTriple, ssQuad] * Shift) = []) and //single or first of a multi click
(CursorNode <> nil) then
begin
if FMouseDownOnFoldingSign then
// mousedown occured on expand sign -> expand/collapse
CursorNode.Expanded := not CursorNode.Expanded
else if (LogicalX >= CursorNode.DisplayStateIconLeft) or
(tvoRowSelect in Options) then
else if (LogicalX >= CursorNode.DisplayStateIconLeft) or (tvoRowSelect in Options) then
begin
// mousedown occured in text or icon -> select node and begin drag operation
{$IFDEF VerboseDrag}