paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-11-19 15:59:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

lcl: TTreeView: cleaned up TNodeState, removed not used nsInTree, added nsVisible

Browse Source 
git-svn-id: trunk@56482 -
This commit is contained in:
mattias 2017-11-24 16:50:16 +00:00
parent 4fab6dcb04
commit c9af6fa9ba
3 changed files with 43 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docs/xml/lcl/comctrls.xml
View File

@ -11601,7 +11601,7 @@
<short>
<var>TNodeState</var> - enumerated type denoting the status of a TreeNode</short>
<descr>
<p>Cut, DropHilited, Focused, Selected, MultiSelected, Expanded, HasChildren, InTree, Deleting, Bound</p>
<p>Cut, DropHilited, Focused, Selected, MultiSelected, Expanded, HasChildren, Deleting, Bound</p>
</descr>
<seealso/>
</element>
@ -12193,12 +12193,6 @@ Const
<seealso/>
</element>
<!-- variable Visibility: private -->
<element name="TTreeNode.FInTree">
<short/>
<descr/>
<seealso/>
</element>
<!-- variable Visibility: private -->
<element name="TTreeNode.FImageIndex">
<short/>
<descr/>
@ -13699,7 +13693,7 @@ If Images.HasOverlays then it is fetched from Images via Images.Overlay(Node.Ove
<p>
<var>StateIndex</var> the index of the state (within an enumerated type)</p>
<p>Definition of enumerated type NodeState:</p>
<p>nsCut, nsDropHilited, nsFocused, nsSelected, nsMultiSelected, nsExpanded, nsHasChildren, nsInTree, nsDeleting, nsBound</p>
<p>nsCut, nsDropHilited, nsFocused, nsSelected, nsMultiSelected, nsExpanded, nsHasChildren, nsDeleting, nsBound</p>
</descr>
<seealso/>
</element>

20
lcl/comctrls.pp
View File

@ -2767,8 +2767,19 @@ type
TTreeNode = class;
TTreeNodeClass = class of TTreeNode;
TNodeState = (nsCut, nsDropHilited, nsFocused, nsSelected, nsMultiSelected,
nsExpanded, nsHasChildren, nsInTree, nsDeleting, nsBound);
TNodeState = (
nsCut, // = Node.Cut
nsDropHilited, // = Node.DropTarget
nsFocused, // = Node.Focused
nsSelected, // = Node.Selected
nsMultiSelected, // = Node.MultiSelected
nsExpanded, // = Node.Expanded
nsHasChildren, // = Node.HasChildren
nsDeleting, // = Node.Deleting, set on Destroy
nsVisible, // = Node.Visible
nsBound // bound to a tree, e.g. has Parent or is top lvl node
);
TNodeStates = set of TNodeState;
TNodeAttachMode = (
naAdd, // add as last sibling of Destination
@ -2905,7 +2916,6 @@ type
FSubTreeCount: integer;// total of all child nodes and self
FText: string;
FTop: integer; // top coordinate
FVisible: Boolean;
function AreParentsExpandedAndVisible: Boolean;
procedure BindToMultiSelected;
function CompareCount(CompareMe: Integer): Boolean;
@ -2930,6 +2940,7 @@ type
function GetTreeNodes: TTreeNodes;
function GetTreeView: TCustomTreeView;
function GetTop: integer;
function GetVisible: Boolean;
procedure InternalMove(ANode: TTreeNode; AddMode: TAddMode);
function IsEqual(Node: TTreeNode): Boolean;
function IsNodeVisible: Boolean;
@ -3051,7 +3062,7 @@ type
property Top: integer read GetTop;
property TreeNodes: TTreeNodes read GetTreeNodes;
property TreeView: TCustomTreeView read GetTreeView;
property Visible: Boolean read FVisible write SetVisible default True;
property Visible: Boolean read GetVisible write SetVisible default True;
end;
{ TTreeNodesEnumerator }
@ -3252,7 +3263,6 @@ type
TCustomTreeView = class(TCustomControl)
private
FAccessibilityOn: Boolean;
// FBackgroundColor: TColor;
FBottomItem: TTreeNode;
FCallingOnChange: Boolean;
FEditingItem: TTreeNode;

52
lcl/include/treeview.inc
View File

@ -302,11 +302,10 @@ begin
FOverlayIndex := -1;
FSelectedIndex := -1;
FStateIndex := -1;
FStates := [];
FStates := [nsVisible];
FOwner := AnOwner;
FSubTreeCount := 1;
FIndex := -1;
FVisible := True;
if Owner<>nil then inc(Owner.FCount);
end;
@ -320,7 +319,7 @@ begin
Include(FStates,nsDeleting);
// we must trigger TCustomTreeView.OnDeletion event before
// unbinding.See issue #17832.
// unbinding. See issue #17832.
if Assigned(Owner) and Assigned(Owner.Owner) then
Owner.Owner.Delete(Self);
@ -405,6 +404,11 @@ begin
Result := FTop;
end;
function TTreeNode.GetVisible: Boolean;
begin
Result:=nsVisible in FStates;
end;
function TTreeNode.HasAsParent(AValue: TTreeNode): Boolean;
begin
if AValue<>nil then begin
@ -424,7 +428,7 @@ begin
if TreeView=nil then exit;
Include(TreeView.FStates,tvsMaxRightNeedsUpdate);
if (TreeView.SortType in [stText, stBoth])
and (nsInTree in FStates) then begin
and (nsBound in FStates) then begin
if (Parent <> nil) then Parent.AlphaSort
else TreeView.AlphaSort;
end;
@ -443,7 +447,7 @@ begin
if (TreeView<>nil)
and (TreeView.SortType in [stData, stBoth]) and Assigned(TreeView.OnCompare)
and (not Deleting)
and (nsInTree in FStates) then
and (nsBound in FStates) then
begin
if Parent <> nil then
Parent.AlphaSort
@ -527,8 +531,11 @@ end;
procedure TTreeNode.SetVisible(const AValue: Boolean);
begin
if FVisible = AValue then exit;
FVisible := AValue;
if Visible = AValue then exit;
if AValue then
Include(FStates,nsVisible)
else
Exclude(FStates,nsVisible);
Selected := False;
if TreeView<>nil then
TreeView.FStates:=TreeView.FStates+[tvsScrollbarChanged,tvsTopsNeedsUpdate,
@ -839,8 +846,6 @@ begin
if TreeView<>nil then
TreeView.FLastDropTarget:=nil;
end;
{if Value then TreeView_SelectDropTarget(Handle, ItemId)
else if DropTarget then TreeView_SelectDropTarget(Handle, nil);}
end;
function TTreeNode.GetHasChildren: Boolean;
@ -910,7 +915,7 @@ end;
function TTreeNode.GetNextVisible: TTreeNode;
begin
if FVisible and Expanded and (GetFirstVisibleChild<>nil) then
if Visible and Expanded and (GetFirstVisibleChild<>nil) then
Result:=GetFirstVisibleChild
else begin
Result:=Self;
@ -919,7 +924,7 @@ begin
if Result<>nil then
Result:=Result.GetNextVisibleSibling;
end;
if (Result<>nil) and ( (not Result.FVisible) or (not AreParentsExpandedAndVisible) ) then
if (Result<>nil) and ( (not Result.Visible) or (not AreParentsExpandedAndVisible) ) then
Result:=nil;
end;
@ -928,9 +933,9 @@ begin
Result := Self;
repeat
Result := Result.GetNextSibling;
until ((Result=nil) or (Result.FVisible));
if (Result<>nil) and (not Result.FVisible) then // Result := nil ... will be removed
Assert(False,'TTreeNode.GetNextVisibleSibling: (Result<>nil) and (not Result.FVisible)');
until ((Result=nil) or (Result.Visible));
if (Result<>nil) and (not Result.Visible) then // Result := nil ... will be removed
Assert(False,'TTreeNode.GetNextVisibleSibling: (Result<>nil) and (not Result.Visible)');
end;
function TTreeNode.GetPrevVisible: TTreeNode;
@ -947,7 +952,7 @@ begin
end
else
Result := Parent;
if (Result<>nil) and ( (not Result.FVisible) or (not AreParentsExpandedAndVisible) ) then
if (Result<>nil) and ( (not Result.Visible) or (not AreParentsExpandedAndVisible) ) then
Result:=nil;
end;
@ -956,9 +961,9 @@ begin
Result := Self;
repeat
Result := Result.GetPrevSibling;
until ((Result=nil) or (Result.FVisible));
if (Result<>nil) and (not Result.FVisible) then // Result := nil ... will be removed
Assert(False,'TTreeNode.GetPrevVisibleSibling: (Result<>nil) and (not Result.FVisible)');
until ((Result=nil) or (Result.Visible));
if (Result<>nil) and (not Result.Visible) then // Result := nil ... will be removed
Assert(False,'TTreeNode.GetPrevVisibleSibling: (Result<>nil) and (not Result.Visible)');
end;
function TTreeNode.GetPrevExpanded: TTreeNode;
@ -1030,7 +1035,7 @@ end;
function TTreeNode.GetFirstVisibleChild: TTreeNode;
begin
Result := GetFirstChild;
if (Result<>nil) and (not Result.FVisible) then
if (Result<>nil) and (not Result.Visible) then
Result := Result.GetNextVisibleSibling;
end;
@ -2053,8 +2058,6 @@ end;
function TTreeNodes.GetCount: Integer;
begin
Result:=FCount;
//if Owner.HandleAllocated then Result := TreeView_GetCount(Handle)
//else Result := 0;
end;
function TTreeNodes.GetOwner: TPersistent;
@ -2348,7 +2351,6 @@ begin
Result := FTopLvlItems[0]
else
Result := nil;
//Result := GetNode(TreeView_GetRoot(Handle));
end;
function TTreeNodes.GetFirstVisibleNode: TTreeNode;
@ -3368,7 +3370,7 @@ var
begin
//DebugLn(['TCustomTreeView.BeginEditing tvsIsEditing=',tvsIsEditing in FStates,' Selected=',Selected<>nil]);
if (tvsIsEditing in FStates) or (ANode=nil) then exit;
if (not CanEdit(ANode)) or (not ANode.FVisible) then exit;
if (not CanEdit(ANode)) or (not ANode.Visible) then exit;
// if we are asked to edit another node while one is already being edited then
// stop editing that node
if FEditingItem <> nil then
@ -3630,7 +3632,7 @@ var
procedure CalculateTops(Node: TTreeNode);
begin
while Node<>nil do begin
if Node.FVisible then begin
if Node.Visible then begin
Node.fTop:=CurTop;
inc(CurTop, Node.Height);
if Node.Expanded then
@ -4590,8 +4592,6 @@ begin
if HandleAllocated then
if Value <> nil then
Value.DropTarget := True;
{else
TreeView_SelectDropTarget(Handle, nil);}
end;
procedure TCustomTreeView.SetExpandSignSize(const AExpandSignSize: integer);