diff --git a/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp b/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp index b5e5bbd1..db230d9a 100644 --- a/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp +++ b/PowerEditor/src/WinControls/FunctionList/functionListPanel.cpp @@ -429,7 +429,7 @@ void FunctionListPanel::notified(LPNMHDR notification) BOOL FunctionListPanel::setTreeViewImageList(int root_id, int node_id, int leaf_id) { HBITMAP hbmp; - + COLORREF maskColour = RGB(192, 192, 192); const int nbBitmaps = 3; // Creation of image list @@ -440,19 +440,19 @@ BOOL FunctionListPanel::setTreeViewImageList(int root_id, int node_id, int leaf_ hbmp = LoadBitmap(_hInst, MAKEINTRESOURCE(root_id)); if (hbmp == NULL) return FALSE; - ImageList_Add(_hTreeViewImaLst, hbmp, (HBITMAP)NULL); + ImageList_AddMasked(_hTreeViewImaLst, hbmp, maskColour); DeleteObject(hbmp); hbmp = LoadBitmap(_hInst, MAKEINTRESOURCE(node_id)); if (hbmp == NULL) return FALSE; - ImageList_Add(_hTreeViewImaLst, hbmp, (HBITMAP)NULL); + ImageList_AddMasked(_hTreeViewImaLst, hbmp, maskColour); DeleteObject(hbmp); hbmp = LoadBitmap(_hInst, MAKEINTRESOURCE(leaf_id)); if (hbmp == NULL) return FALSE; - ImageList_Add(_hTreeViewImaLst, hbmp, (HBITMAP)NULL); + ImageList_AddMasked(_hTreeViewImaLst, hbmp, maskColour); DeleteObject(hbmp); if (ImageList_GetImageCount(_hTreeViewImaLst) < nbBitmaps) diff --git a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp index 4184a527..edcac31e 100644 --- a/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp +++ b/PowerEditor/src/WinControls/ProjectPanel/ProjectPanel.cpp @@ -257,7 +257,7 @@ void ProjectPanel::initMenus() BOOL ProjectPanel::setImageList(int root_clean_id, int root_dirty_id, int project_id, int open_node_id, int closed_node_id, int leaf_id, int ivalid_leaf_id) { HBITMAP hbmp; - + COLORREF maskColour = RGB(192, 192, 192); const int nbBitmaps = 7; // Creation of image list @@ -268,43 +268,43 @@ BOOL ProjectPanel::setImageList(int root_clean_id, int root_dirty_id, int projec hbmp = LoadBitmap(_hInst, MAKEINTRESOURCE(root_clean_id)); if (hbmp == NULL) return FALSE; - ImageList_Add(_hImaLst, hbmp, (HBITMAP)NULL); + ImageList_AddMasked(_hImaLst, hbmp, maskColour); DeleteObject(hbmp); hbmp = LoadBitmap(_hInst, MAKEINTRESOURCE(root_dirty_id)); if (hbmp == NULL) return FALSE; - ImageList_Add(_hImaLst, hbmp, (HBITMAP)NULL); + ImageList_AddMasked(_hImaLst, hbmp, maskColour); DeleteObject(hbmp); hbmp = LoadBitmap(_hInst, MAKEINTRESOURCE(project_id)); if (hbmp == NULL) return FALSE; - ImageList_Add(_hImaLst, hbmp, (HBITMAP)NULL); + ImageList_AddMasked(_hImaLst, hbmp, maskColour); DeleteObject(hbmp); hbmp = LoadBitmap(_hInst, MAKEINTRESOURCE(open_node_id)); if (hbmp == NULL) return FALSE; - ImageList_Add(_hImaLst, hbmp, (HBITMAP)NULL); + ImageList_AddMasked(_hImaLst, hbmp, maskColour); DeleteObject(hbmp); hbmp = LoadBitmap(_hInst, MAKEINTRESOURCE(closed_node_id)); if (hbmp == NULL) return FALSE; - ImageList_Add(_hImaLst, hbmp, (HBITMAP)NULL); + ImageList_AddMasked(_hImaLst, hbmp, maskColour); DeleteObject(hbmp); hbmp = LoadBitmap(_hInst, MAKEINTRESOURCE(leaf_id)); if (hbmp == NULL) return FALSE; - ImageList_Add(_hImaLst, hbmp, (HBITMAP)NULL); + ImageList_AddMasked(_hImaLst, hbmp, maskColour); DeleteObject(hbmp); hbmp = LoadBitmap(_hInst, MAKEINTRESOURCE(ivalid_leaf_id)); if (hbmp == NULL) return FALSE; - ImageList_Add(_hImaLst, hbmp, (HBITMAP)NULL); + ImageList_AddMasked(_hImaLst, hbmp, maskColour); DeleteObject(hbmp); if (ImageList_GetImageCount(_hImaLst) < nbBitmaps) diff --git a/PowerEditor/src/icons/funcList_leaf.bmp b/PowerEditor/src/icons/funcList_leaf.bmp index 3c79301b..0ff2ba6b 100644 Binary files a/PowerEditor/src/icons/funcList_leaf.bmp and b/PowerEditor/src/icons/funcList_leaf.bmp differ diff --git a/PowerEditor/src/icons/funcList_node.bmp b/PowerEditor/src/icons/funcList_node.bmp index d8546514..c35f6e4d 100644 Binary files a/PowerEditor/src/icons/funcList_node.bmp and b/PowerEditor/src/icons/funcList_node.bmp differ diff --git a/PowerEditor/src/icons/project_file.bmp b/PowerEditor/src/icons/project_file.bmp index d97237d6..17ff75e0 100644 Binary files a/PowerEditor/src/icons/project_file.bmp and b/PowerEditor/src/icons/project_file.bmp differ diff --git a/PowerEditor/src/icons/project_file_invalid.bmp b/PowerEditor/src/icons/project_file_invalid.bmp index 2911b5e3..a6377ffd 100644 Binary files a/PowerEditor/src/icons/project_file_invalid.bmp and b/PowerEditor/src/icons/project_file_invalid.bmp differ diff --git a/PowerEditor/src/icons/project_folder_close.bmp b/PowerEditor/src/icons/project_folder_close.bmp index 6d6fad29..a00d454c 100644 Binary files a/PowerEditor/src/icons/project_folder_close.bmp and b/PowerEditor/src/icons/project_folder_close.bmp differ diff --git a/PowerEditor/src/icons/project_folder_open.bmp b/PowerEditor/src/icons/project_folder_open.bmp index 35db35ce..5aae97e6 100644 Binary files a/PowerEditor/src/icons/project_folder_open.bmp and b/PowerEditor/src/icons/project_folder_open.bmp differ diff --git a/PowerEditor/src/icons/project_root.bmp b/PowerEditor/src/icons/project_root.bmp index f50cbb9e..f47dbc55 100644 Binary files a/PowerEditor/src/icons/project_root.bmp and b/PowerEditor/src/icons/project_root.bmp differ diff --git a/PowerEditor/src/icons/project_work_space.bmp b/PowerEditor/src/icons/project_work_space.bmp index f73e3569..13d5eacc 100644 Binary files a/PowerEditor/src/icons/project_work_space.bmp and b/PowerEditor/src/icons/project_work_space.bmp differ diff --git a/PowerEditor/src/icons/project_work_space_dirty.bmp b/PowerEditor/src/icons/project_work_space_dirty.bmp index 6c539f01..7685aba0 100644 Binary files a/PowerEditor/src/icons/project_work_space_dirty.bmp and b/PowerEditor/src/icons/project_work_space_dirty.bmp differ