Minor modification.

kovacsv · Nov 1, 2020 · d2fffa0 · d2fffa0
1 parent 4b7b6e9
commit d2fffa0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/Sources/WindowsAppSupport/WAS_NodeTree.cpp b/Sources/WindowsAppSupport/WAS_NodeTree.cpp
@@ -9,8 +9,8 @@ namespace WAS
 NodeTreeView::NodeTreeView () :
 	treeHandle (NULL),
 	imageList (NULL),
-	groupClosedBitmap (-1),
-	groupOpenedBitmap (-1),
+	closedBitmapIndex (-1),
+	openedBitmapIndex (-1),
 	groups ()
 {
 
@@ -36,7 +36,7 @@ bool NodeTreeView::Init (HWND parentHandle, int x, int y, int width, int height)
 	return true;
 }
 
-bool NodeTreeView::InitImageList (HBITMAP closedBitmap, HBITMAP openedBitmap)
+bool NodeTreeView::InitImageList (HBITMAP groupClosedBitmap, HBITMAP groupOpenedBitmap)
 {
 	if (DBGERROR (imageList != NULL)) {
 		return false;
@@ -45,8 +45,8 @@ bool NodeTreeView::InitImageList (HBITMAP closedBitmap, HBITMAP openedBitmap)
 	if (DBGERROR (imageList == NULL)) {
 		return false;
 	}
-	groupClosedBitmap = ImageList_Add (imageList, closedBitmap, NULL);
-	groupOpenedBitmap = ImageList_Add (imageList, openedBitmap, NULL);
+	closedBitmapIndex = ImageList_Add (imageList, groupClosedBitmap, NULL);
+	openedBitmapIndex = ImageList_Add (imageList, groupOpenedBitmap, NULL);
 	TreeView_SetImageList (treeHandle, imageList, TVSIL_NORMAL);
 	return true;
 }
@@ -82,8 +82,8 @@ void NodeTreeView::AddGroup (const std::wstring& group)
 
 	if (imageList != NULL) {
 		tvInsertStruct.item.mask |= TVIF_IMAGE | TVIF_SELECTEDIMAGE;
-		tvInsertStruct.item.iImage = groupClosedBitmap;
-		tvInsertStruct.item.iSelectedImage = groupClosedBitmap;
+		tvInsertStruct.item.iImage = closedBitmapIndex;
+		tvInsertStruct.item.iSelectedImage = closedBitmapIndex;
 	}
 
 	HTREEITEM groupItem = (HTREEITEM) SendMessage (treeHandle, TVM_INSERTITEM, 0, (LPARAM) &tvInsertStruct);
@@ -120,11 +120,11 @@ void NodeTreeView::GroupExpanded (const TVITEMW& group)
 {
 	TVITEM newGroup = group;
 	if (group.state & TVIS_EXPANDED) {
-		newGroup.iImage = groupOpenedBitmap;
-		newGroup.iSelectedImage = groupOpenedBitmap;
+		newGroup.iImage = openedBitmapIndex;
+		newGroup.iSelectedImage = openedBitmapIndex;
 	} else {
-		newGroup.iImage = groupClosedBitmap;
-		newGroup.iSelectedImage = groupClosedBitmap;
+		newGroup.iImage = closedBitmapIndex;
+		newGroup.iSelectedImage = closedBitmapIndex;
 	}
 	TreeView_SetItem (treeHandle, &newGroup);
 }

diff --git a/Sources/WindowsAppSupport/WAS_NodeTree.hpp b/Sources/WindowsAppSupport/WAS_NodeTree.hpp
@@ -14,7 +14,7 @@ class NodeTreeView
 	~NodeTreeView ();
 
 	bool		Init (HWND parentHandle, int x, int y, int width, int height);
-	bool		InitImageList (HBITMAP closedBitmap, HBITMAP openedBitmap);
+	bool		InitImageList (HBITMAP groupClosedBitmap, HBITMAP groupOpenedBitmap);
 	void		Resize (int x, int y, int width, int height);
 
 	bool		HasGroup (const std::wstring& group) const;
@@ -28,8 +28,8 @@ class NodeTreeView
 private:
 	HWND											treeHandle;
 	HIMAGELIST										imageList;
-	int												groupClosedBitmap;
-	int												groupOpenedBitmap;
+	int												closedBitmapIndex;
+	int												openedBitmapIndex;
 	std::unordered_map<std::wstring, HTREEITEM>		groups;
 };