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

LCL: Select a single TreeView node with RightClick also when MultiSelect is enabled. Issue #28193, patch from Ondrej Pokorny.

Browse Source 
git-svn-id: trunk@49209 -
This commit is contained in:
juha 2015-05-29 10:20:39 +00:00
parent ff1446d780
commit 8c08115db1
1 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
lcl/include/treeview.inc
View File

@ -5192,27 +5192,9 @@ var
CursorNode: TTreeNode;
LogicalX: Integer;
CursorNodeSelected: Boolean;
begin
{$IFDEF VerboseDrag}
DebugLn('TCustomTreeView.MouseDown A ',DbgSName(Self),' ');
{$ENDIF}
fMouseDownPos := Point(X,Y);
FStates:=FStates-[tvsEditOnMouseUp,tvsSingleSelectOnMouseUp];
if not Focused and CanFocus then
SetFocus;
inherited MouseDown(Button, Shift, X, Y);
CursorNode := GetNodeAt(X, Y);
CursorNodeSelected := (CursorNode<>nil)
and (CursorNode.Selected
or ((tvoAllowMultiselect in Options) and CursorNode.MultiSelected));
LogicalX:=X;
if ((Button = mbLeft) or ((Button = mbRight) and RightClickSelect)) and
(([ssDouble, ssTriple, ssQuad] * Shift) = []) then
procedure ChangeSelection;
begin
// single click or first of a multi click
if (CursorNode <> nil) then
begin
if CursorNode.HasChildren and ShowButtons and
@ -5263,8 +5245,37 @@ begin
end;
end;
end;
end
else // multi click
end;//ChangeSelection
begin
{$IFDEF VerboseDrag}
DebugLn('TCustomTreeView.MouseDown A ',DbgSName(Self),' ');
{$ENDIF}
fMouseDownPos := Point(X,Y);
FStates:=FStates-[tvsEditOnMouseUp,tvsSingleSelectOnMouseUp];
if not Focused and CanFocus then
SetFocus;
CursorNode := GetNodeAt(X, Y);
CursorNodeSelected := (CursorNode<>nil)
and (CursorNode.Selected
or ((tvoAllowMultiselect in Options) and CursorNode.MultiSelected));
LogicalX:=X;
if (Button = mbRight) and RightClickSelect and
(([ssDouble, ssTriple, ssQuad] * Shift) = [])//single right click or first of a multi click
then
ChangeSelection;
inherited MouseDown(Button, Shift, X, Y);
if (Button = mbLeft) and
(([ssDouble, ssTriple, ssQuad] * Shift) = [])//single left click or first of a multi click
then
ChangeSelection;
// multi click
if not (tvoNoDoubleClickExpand in Options) and (ssDouble in Shift)
and (Button = mbLeft) and (CursorNode<>nil) then
CursorNode.Expanded := not CursorNode.Expanded;