Open/Close folder icon in test application.

Author: kovacsv

Documentation/WindowsEmbeddingDemo01.png

@@ -36,15 +36,7 @@ const CreatorFunction& NodeTree::Item::GetCreator () const
 }
 
 NodeTree::Group::Group (const std::wstring& name) :
-	name (name),
-	iconId (InvalidIconId)
-{
-
-}
-
-NodeTree::Group::Group (const std::wstring& name, const IconId& iconId) :
-	name (name),
-	iconId (iconId)
+	name (name)
 {
 
 }
@@ -59,11 +51,6 @@ const std::wstring& NodeTree::Group::GetName () const
 	return name;
 }
 
-const NUIE::IconId& NodeTree::Group::GetIconId () const
-{
-	return iconId;
-}
-
 const std::vector<NodeTree::Item>& NodeTree::Group::GetItems () const
 {
 	return items;
@@ -80,12 +67,6 @@ size_t NodeTree::AddGroup (const std::wstring& groupName)
 	return groups.size () - 1;
 }
 
-size_t NodeTree::AddGroup (const std::wstring& groupName, const IconId& iconId)
-{
-	groups.push_back (Group (groupName, iconId));
-	return groups.size () - 1;
-}
-
 void NodeTree::AddItem (size_t groupIndex, const std::wstring& itemName, const CreatorFunction& creator)
 {
 	groups[groupIndex].AddItem (Item (itemName, creator));

Sources/NodeUIEngine/NUIE_NodeTree.cpp

@@ -38,19 +38,16 @@ class NodeTree
 		void						AddItem (const Item& item);
 
 		const std::wstring&			GetName () const;
-		const IconId&				GetIconId () const;
 		const std::vector<Item>&	GetItems () const;
 
 	private:
 		std::wstring		name;
-		IconId				iconId;
 		std::vector<Item>	items;
 	};
 
 	NodeTree ();
 
 	size_t						AddGroup (const std::wstring& groupName);
-	size_t						AddGroup (const std::wstring& groupName, const IconId& iconId);
 	void						AddItem (size_t groupIndex, const std::wstring& itemName, const CreatorFunction& creator);
 	void						AddItem (size_t groupIndex, const std::wstring& itemName, const IconId& iconId, const CreatorFunction& creator);
 

Sources/NodeUIEngine/NUIE_NodeTree.hpp

@@ -42,6 +42,8 @@ static LRESULT CALLBACK NodeEditorNodeListStaticWindowProc (HWND hwnd, UINT msg,
 				case TVN_SELCHANGED:
 					control->TreeViewSelectionChanged ((LPNMTREEVIEW) lParam);
 					break;
+				case TVN_ITEMEXPANDED:
+					control->TreeViewItemExpanded ((LPNMTREEVIEW) lParam);
 				case NM_DBLCLK:
 					control->TreeViewDoubleClick (header);
 					break;
@@ -165,15 +167,26 @@ void NodeEditorNodeTreeHwndControl::TreeViewSelectionChanged (LPNMTREEVIEW lpnmt
 	selectedNode = lpnmtv->itemNew.lParam;
 }
 
+void NodeEditorNodeTreeHwndControl::TreeViewItemExpanded (LPNMTREEVIEW lpnmtv)
+{
+	if (lpnmtv->hdr.hwndFrom != nodeTreeView.GetListHandle ()) {
+		return;
+	}
+
+	nodeTreeView.GroupExpanded (lpnmtv->itemNew);
+}
+
 void NodeEditorNodeTreeHwndControl::FillNodeTree (const NUIE::NodeTree& nodeTree, ImageLoader* imageLoader)
 {
 	if (imageLoader != nullptr) {
-		nodeTreeView.InitImageList ();
+		nodeTreeView.InitImageList (
+			imageLoader->LoadGroupClosedImage (),
+			imageLoader->LoadGroupOpenedImage ()
+		);
 	}
 	LPARAM nextNodeId = 0;
 	for (const NUIE::NodeTree::Group& group : nodeTree.GetGroups ()) {
-		HBITMAP groupIcon = LoadTreeImage (imageLoader, group.GetIconId ());
-		nodeTreeView.AddGroup (group.GetName (), groupIcon);
+		nodeTreeView.AddGroup (group.GetName ());
 		for (const NUIE::NodeTree::Item& item : group.GetItems ()) {
 			HBITMAP itemIcon = LoadTreeImage (imageLoader, item.GetIconId ());
 			nodeTreeView.AddItem (group.GetName (), item.GetName (), itemIcon, nextNodeId);

Sources/WindowsAppSupport/WAS_NodeEditorNodeTreeHwndControl.cpp

@@ -18,6 +18,8 @@ class NodeEditorNodeTreeHwndControl : public NUIE::NativeNodeEditorControl
 		ImageLoader ();
 		virtual ~ImageLoader ();
 
+		virtual HBITMAP LoadGroupClosedImage () = 0;
+		virtual HBITMAP LoadGroupOpenedImage () = 0;
 		virtual HBITMAP LoadImage (const NUIE::IconId& iconId) = 0;
 	};
 
@@ -38,6 +40,7 @@ class NodeEditorNodeTreeHwndControl : public NUIE::NativeNodeEditorControl
 	void							FillNodeTree (const NUIE::NodeTree& nodeTree, ImageLoader* imageLoader);
 	void							TreeViewDoubleClick (LPNMHDR lpnmhdr);
 	void							TreeViewSelectionChanged (LPNMTREEVIEW lpnmtv);
+	void							TreeViewItemExpanded (LPNMTREEVIEW lpnmtv);
 	void							TreeViewBeginDrag (LPNMTREEVIEW lpnmtv);
 	void							TreeViewEndDrag (int x, int y);
 

Sources/WindowsAppSupport/WAS_NodeEditorNodeTreeHwndControl.hpp

@@ -7,8 +7,10 @@ namespace WAS
 {
 
 NodeTreeView::NodeTreeView () :
-	listHandle (NULL),
+	treeHandle (NULL),
 	imageList (NULL),
+	groupClosedBitmap (-1),
+	groupOpenedBitmap (-1),
 	groups ()
 {
 
@@ -23,43 +25,46 @@ NodeTreeView::~NodeTreeView ()
 
 bool NodeTreeView::Init (HWND parentHandle, int x, int y, int width, int height)
 {
-	listHandle = CreateWindowEx (
+	treeHandle = CreateWindowEx (
 		0, WC_TREEVIEW, NULL, WS_VISIBLE | WS_CHILD | TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS, 
 		x, y, width, height, parentHandle, NULL, NULL, NULL
 	);
-	if (DBGERROR (listHandle == NULL)) {
+	if (DBGERROR (treeHandle == NULL)) {
 		return false;
 	}
+	TreeView_SetItemHeight (treeHandle, 20);
 	return true;
 }
 
-bool NodeTreeView::InitImageList ()
+bool NodeTreeView::InitImageList (HBITMAP closedBitmap, HBITMAP openedBitmap)
 {
 	if (DBGERROR (imageList != NULL)) {
 		return false;
 	}
-	imageList = ImageList_Create (18, 18, ILC_COLOR32, 1, 1);
+	imageList = ImageList_Create (18, 18, ILC_COLOR32, 2, 1);
 	if (DBGERROR (imageList == NULL)) {
 		return false;
 	}
-	TreeView_SetImageList (listHandle, imageList, TVSIL_NORMAL);
+	groupClosedBitmap = ImageList_Add (imageList, closedBitmap, NULL);
+	groupOpenedBitmap = ImageList_Add (imageList, openedBitmap, NULL);
+	TreeView_SetImageList (treeHandle, imageList, TVSIL_NORMAL);
 	return true;
 }
 
 void NodeTreeView::Resize (int x, int y, int width, int height)
 {
-	if (listHandle == NULL) {
+	if (treeHandle == NULL) {
 		return;
 	}
-	MoveWindow (listHandle, x, y, width, height, TRUE);
+	MoveWindow (treeHandle, x, y, width, height, TRUE);
 }
 
 bool NodeTreeView::HasGroup (const std::wstring& group) const
 {
 	return groups.find (group) != groups.end ();
 }
 
-void NodeTreeView::AddGroup (const std::wstring& group, HBITMAP bitmap)
+void NodeTreeView::AddGroup (const std::wstring& group)
 {
 	auto found = groups.find (group);
 	if (DBGERROR (found != groups.end ())) {
@@ -75,15 +80,13 @@ void NodeTreeView::AddGroup (const std::wstring& group, HBITMAP bitmap)
 	tvInsertStruct.item.cchTextMax = sizeof (tvInsertStruct.item.pszText) / sizeof (wchar_t);
 	tvInsertStruct.item.lParam = (LPARAM) -1;
 
-	if (imageList != NULL && bitmap != NULL) {
-		int imageIndex = ImageList_GetImageCount (imageList);
-		ImageList_Add (imageList, bitmap, NULL);
+	if (imageList != NULL) {
 		tvInsertStruct.item.mask |= TVIF_IMAGE | TVIF_SELECTEDIMAGE;
-		tvInsertStruct.item.iImage = imageIndex;
-		tvInsertStruct.item.iSelectedImage = imageIndex;
+		tvInsertStruct.item.iImage = groupClosedBitmap;
+		tvInsertStruct.item.iSelectedImage = groupClosedBitmap;
 	}
 
-	HTREEITEM groupItem = (HTREEITEM) SendMessage (listHandle, TVM_INSERTITEM, 0, (LPARAM) &tvInsertStruct);
+	HTREEITEM groupItem = (HTREEITEM) SendMessage (treeHandle, TVM_INSERTITEM, 0, (LPARAM) &tvInsertStruct);
 	groups.insert ({ group, groupItem });
 }
 
@@ -104,26 +107,38 @@ void NodeTreeView::AddItem (const std::wstring& group, const std::wstring& text,
 	tvInsertStruct.item.lParam = lParam;
 
 	if (imageList != NULL && bitmap != NULL) {
-		int imageIndex = ImageList_GetImageCount (imageList);
-		ImageList_Add (imageList, bitmap, NULL);
+		int imageIndex = ImageList_Add (imageList, bitmap, NULL);
 		tvInsertStruct.item.mask |= TVIF_IMAGE | TVIF_SELECTEDIMAGE;
 		tvInsertStruct.item.iImage = imageIndex;
 		tvInsertStruct.item.iSelectedImage = imageIndex;
 	}
 
-	SendMessage (listHandle, TVM_INSERTITEM, 0, (LPARAM) &tvInsertStruct);
+	SendMessage (treeHandle, TVM_INSERTITEM, 0, (LPARAM) &tvInsertStruct);
+}
+
+void NodeTreeView::GroupExpanded (const TVITEMW& group)
+{
+	TVITEM newGroup = group;
+	if (group.state & TVIS_EXPANDED) {
+		newGroup.iImage = groupOpenedBitmap;
+		newGroup.iSelectedImage = groupOpenedBitmap;
+	} else {
+		newGroup.iImage = groupClosedBitmap;
+		newGroup.iSelectedImage = groupClosedBitmap;
+	}
+	TreeView_SetItem (treeHandle, &newGroup);
 }
 
 void NodeTreeView::ExpandAll ()
 {
 	for (const auto& it : groups) {
-		TreeView_Expand (listHandle, it.second, TVM_EXPAND);
+		TreeView_Expand (treeHandle, it.second, TVM_EXPAND);
 	}
 }
 
 HWND NodeTreeView::GetListHandle ()
 {
-	return listHandle;
+	return treeHandle;
 }
 
 }

Sources/WindowsAppSupport/WAS_NodeTree.cpp

@@ -14,19 +14,22 @@ class NodeTreeView
 	~NodeTreeView ();
 
 	bool		Init (HWND parentHandle, int x, int y, int width, int height);
-	bool		InitImageList ();
+	bool		InitImageList (HBITMAP closedBitmap, HBITMAP openedBitmap);
 	void		Resize (int x, int y, int width, int height);
 
 	bool		HasGroup (const std::wstring& group) const;
-	void		AddGroup (const std::wstring& group, HBITMAP bitmap);
+	void		AddGroup (const std::wstring& group);
 	void		AddItem (const std::wstring& group, const std::wstring& text, HBITMAP bitmap, LPARAM lParam);
+	void		GroupExpanded (const TVITEMW& group);
 	void		ExpandAll ();
 
 	HWND		GetListHandle ();
 
 private:
-	HWND											listHandle;
+	HWND											treeHandle;
 	HIMAGELIST										imageList;
+	int												groupClosedBitmap;
+	int												groupOpenedBitmap;
 	std::unordered_map<std::wstring, HTREEITEM>		groups;
 };
 

Sources/WindowsAppSupport/WAS_NodeTree.hpp

@@ -123,6 +123,16 @@ class AppUIEnvironment : public NUIE::NodeUIEnvironment
 		class ImageLoader : public WAS::NodeEditorNodeTreeHwndControl::ImageLoader
 		{
 		public:
+			virtual HBITMAP LoadGroupClosedImage () override
+			{
+				return WAS::LoadBitmapFromResource (MAKEINTRESOURCE (FOLDERCLOSED_ICON), L"IMAGE");
+			}
+
+			virtual HBITMAP LoadGroupOpenedImage () override
+			{
+				return WAS::LoadBitmapFromResource (MAKEINTRESOURCE (FOLDEROPENED_ICON), L"IMAGE");
+			}
+
 			virtual HBITMAP LoadImage (const NUIE::IconId& iconId) override
 			{
 				return WAS::LoadBitmapFromResource (MAKEINTRESOURCE (iconId.GetId ()), L"IMAGE");
@@ -131,7 +141,7 @@ class AppUIEnvironment : public NUIE::NodeUIEnvironment
 
 		NUIE::NodeTree nodeTree;
 
-		size_t inputNodes = nodeTree.AddGroup (L"Input Nodes", NUIE::IconId (FOLDEROPENED_ICON));
+		size_t inputNodes = nodeTree.AddGroup (L"Input Nodes");
 		AddNodeTreeItem (nodeTree, inputNodes, L"Boolean", NUIE::IconId (TREE_BOOLEAN_ICON), [&] (const NUIE::Point& position) {
 			return NUIE::UINodePtr (new BI::BooleanNode (NE::LocString (L"Boolean"), position, true));
 		});
@@ -150,7 +160,7 @@ class AppUIEnvironment : public NUIE::NodeUIEnvironment
 		AddNodeTreeItem (nodeTree, inputNodes, L"Number Distribution", NUIE::IconId (TREE_DOUBLEDISTRIBUTED_ICON), [&] (const NUIE::Point& position) {
 			return NUIE::UINodePtr (new BI::DoubleDistributedNode (NE::LocString (L"Number Distribution"), position));
 		});
-		size_t mathematicalNodes = nodeTree.AddGroup (L"Mathematical Nodes", NUIE::IconId (FOLDEROPENED_ICON));
+		size_t mathematicalNodes = nodeTree.AddGroup (L"Mathematical Nodes");
 		AddNodeTreeItem (nodeTree, mathematicalNodes, L"Addition", NUIE::IconId (TREE_ADDITION_ICON), [&] (const NUIE::Point& position) {
 			return NUIE::UINodePtr (new BI::AdditionNode (NE::LocString (L"Addition"), position));
 		});
@@ -178,7 +188,7 @@ class AppUIEnvironment : public NUIE::NodeUIEnvironment
 		AddNodeTreeItem (nodeTree, mathematicalNodes, L"Sqrt", NUIE::IconId (TREE_SQRT_ICON), [&] (const NUIE::Point& position) {
 			return NUIE::UINodePtr (new BI::SqrtNode (NE::LocString (L"Sqrt"), position));
 		});
-		size_t otherNodes = nodeTree.AddGroup (L"Other Nodes", NUIE::IconId (FOLDEROPENED_ICON));
+		size_t otherNodes = nodeTree.AddGroup (L"Other Nodes");
 		AddNodeTreeItem (nodeTree, otherNodes, L"List Builder", NUIE::IconId (TREE_LISTBUILDER_ICON), [&] (const NUIE::Point& position) {
 			return NUIE::UINodePtr (new BI::ListBuilderNode (NE::LocString (L"List Builder"), position));
 		});