From b139d878e00c1c6121e969b89846977dbb8dc0cf Mon Sep 17 00:00:00 2001 From: Don Ho Date: Sun, 10 Aug 2014 23:22:04 +0000 Subject: [PATCH] [BUG_FIXED] Make icons' background color of functionList and projectManager transparent. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1272 f5eea248-9336-0410-98b8-ebc06183d4e3 --- .../FunctionList/functionListPanel.cpp | 8 ++++---- .../WinControls/ProjectPanel/ProjectPanel.cpp | 16 ++++++++-------- PowerEditor/src/icons/funcList_leaf.bmp | Bin 822 -> 822 bytes PowerEditor/src/icons/funcList_node.bmp | Bin 822 -> 822 bytes PowerEditor/src/icons/project_file.bmp | Bin 822 -> 822 bytes PowerEditor/src/icons/project_file_invalid.bmp | Bin 822 -> 822 bytes PowerEditor/src/icons/project_folder_close.bmp | Bin 822 -> 822 bytes PowerEditor/src/icons/project_folder_open.bmp | Bin 822 -> 822 bytes PowerEditor/src/icons/project_root.bmp | Bin 568 -> 822 bytes PowerEditor/src/icons/project_work_space.bmp | Bin 822 -> 822 bytes .../src/icons/project_work_space_dirty.bmp | Bin 822 -> 822 bytes 11 files changed, 12 insertions(+), 12 deletions(-) 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 3c79301b22d49c3ff53230d79919301e6c001fab..0ff2ba6b7fe7286f5dfb119b2d9610ee93f7af54 100644 GIT binary patch literal 822 zcmZ?rHDhJ~12Z700mK4O%*Y@C7H0s;3v)v-M1XorOF1;yIDSUS388NPYd*kiO zfE5h}^`+{iuP?sFujR$X7pnqRo=HDlr&l-4VrsQ^)rYGeAX-*`_`dql(>3SLtlhnJ z-SRm=!6&Dl08PG}ed$Wx<$8m<`8M)2`=#%G&;Rv)?z`zh(`xi^ zn!h|?8C3D?U%zMk`aSd4^BK=3`b~hl2WSh>igjDotee>d6g=N?{?YnJzgL45&-nFf z!b_mYmuFw#>d_b3SLtlhnJ-SRm= z!6&Dl08PG}ed$Wx<$8m<`8M)2`=#%G&;Rv)?z`zh(`xi^n!h|? z8C3D?U%zMk`aSd4^BK=3`b~hl2WSh>igjDotee>d6g=N?{?YnJzgL45&-nFf!b_mY zmuFw#>d_b-D5&Z5b{99GmROD)B;qt zHQDsW>}Y~orZ?mR5m4p-vol|AsUfHZs2J!bp!q~Etrb=D(1npz|}vz{;*fK2dD*Z6p#T_22?Dw?HybTL_JXPW}8iS3T^|n0ND^N z5XJtdKbjnPufOj-Pf{aLF$CSrx$$f5uirC%A!`v?^|1Bf*X-+G0zg_m$ZmZH)B?Dva51?9r4wJ>u0#^+81=yA^ j+1Ef06Q6Mc;v|SHnqp)vK);|VhR9+iA$~zN8B-YmudXXS literal 822 zcmZ?rHDhJ~12Z700mK4O%*Y@C7H5FULpTufKOykr-D5&Z5b{99GmROD)B;qtHQDsW z>}Y~orZ?mR5m4p-vol|AsUfHZs2J!bp!q~ zEtrb=D(1npz}5eK^S4*G2dD*Z6p#T_22?Dw?HybTL_JXPW}8iS3T^|n0ND^N5XJtd zKbjnPufOj-Pf{aLF$CSrx$$f5uirC%A!`v?^|1Bf*X-+G0zg_m$ZmZH)B?Dva51?9r4wJ>u0#^+81=yA^+1Ef0 f6Q6Mc;v|SHnqp)vK);|VhR9+iA$~zN8B-Ym&OeSy diff --git a/PowerEditor/src/icons/project_file.bmp b/PowerEditor/src/icons/project_file.bmp index d97237d685d09bd452de1adaf9a1b91f7e3ba9f4..17ff75e0cf767f53d7ad8141c663ca6dbc0f1c49 100644 GIT binary patch literal 822 zcmaiy%WA?<6h%`yFCF$1`UQSK=lx74B8uQ3glL0lw2hApQk5Vfpr9xb<6CP7UF6ze zlhkgwcW~}HJNq1cdd}QRp)%Z$ocr^+ksiXj#QW==IHDj)nx+kh!)CMjepRhj3k(^1?s5`3hsAzxYn4W11$0x~{)yTBTA^RaH@x-EQ}b{A4m= eT@g$ReC;r=*emGjJ zN$r7|z@6`&oIAFHRPIDdN(OB5t22!dX(S1y-7ZmLqLfB_@m z?RNWhQvkF89}WkMZ?dODuq(dP>9pJJR;$%)HtY5J=UMyxo*sD2!~UG2-ET$mjYgwZ ztJ$_)tyUT8{isr@wApMT`BTvIgSRjy`ir+L%QQ_43xz^1m(z7UlgVhBwpy+J^~W4r zNYC@;^LZq17)Cyy&t|i#sw#?-PN!3;R5FNY&IH=hQp!jx?!HV z$V^(CWm!%n67hIkIEek~{@3d@E$oQQ)9DmvNJdyJ7R6$*+wJmw5shS^NCqL2OeT}T mU;y9m_qi@$-}eR2kHl5{X>lBf7Tyx6EBG6Nx4XLl diff --git a/PowerEditor/src/icons/project_file_invalid.bmp b/PowerEditor/src/icons/project_file_invalid.bmp index 2911b5e382e3313f94490f14a072ded93eeda832..a6377ffd184be538a52fe9f90a991ee2a7cbf437 100644 GIT binary patch delta 256 zcmdnSwvBCq8Rvlm2Od3obo%t^$%4$HqUDp1$%O7=b>1TxysKjRIiMsEOw80}22nF1 z)JX{S6HHCkWQ5R>j9P49)dwbbGHQX01%i_&Pfm_!6qWw*cJbC~AePlTROI4eL delta 256 zcmdnSwvBCq8R!51{~tYibo%t^$%4$HqUDp1$%O7=b>1TxysKjRIiMsEOw80}{`c?S z#F-H4B!v12rY37LLg+|FEjFMcAeh|AsKp6ko;-PSay+A`^p77uzJ2@l`Sa&bpFaKh z^9Lx5kl)WJD)IH}SD?)M_wV1neTytVS&|8EswaY331mW?HhCqJI_KZNf1$jaOe#Wf a9#HJ@*dVq{JPBw0gs~=TGQydW2xcdOxf8*BiC{`H!L@lZY1Kn4 fh&=Ql@$jSMBaa~{>B!@-0}p8L!vhCgs9^~Jg5(p| delta 403 zcmdnSwvBCqS@M6{gNZY>*dVq{JPBw0gs~=TGQydW2xcdOxf8*BiC{`H!L@lZY1Kn4 rh&=Ql@$jSMBaa~{>B!@-0}tN*`1ASKUj+L7_s_q7RQ9$DHOvD5`b1;V diff --git a/PowerEditor/src/icons/project_folder_open.bmp b/PowerEditor/src/icons/project_folder_open.bmp index 35db35ce9be6912df54dadb29deb62caf26d4355..5aae97e6b820afd68cb554bdc55ad1af40d95041 100644 GIT binary patch literal 822 zcmcJLu}T9$5QbOm#nMOc1q{|=Yn3jwZxCO=QqaoO+E@vqA}CnID-IMpC5YMtjcDYE z5zQshGdVxcPt=YAnCEa7OuH?1R75&!@I literal 822 zcmcJLy-Gtt5QR6`OG+QX7cf`{TdQ=|zCnBeOF=7BYhxvd20_6>Q(REe8G=Ncpb?E+ zVnn_9@g~uaoG=NCS_m%RUgqweGc!Bs#nhA=t`y%{c5<{6Zf1DyxDTeab>Q6R|F4CU z(3m?2f5I9;eEt@TpwWTj#}@3~z6xTJc>4Y457>F?Y(2C$@1l*X=1O@4u1S3+2urPj z^s=CzwEV93EEMwkA^&@~C+h83g{(0O@glDuECv>#w`2G8ROIdD!?ieSG9?*p!UUSI z%}4r5uuV&Y`wQq-3;mlTL6X(w%zSY?Pw8uydt8n6)dIi5(^Ciw`lwO!^e<=Y^qI>p gSu++$j|E7p0R6XOT=nZyEWks^na^c~CH!0P1&=J8YybcN diff --git a/PowerEditor/src/icons/project_root.bmp b/PowerEditor/src/icons/project_root.bmp index f50cbb9ecc55f4a4ac2a4d6cbee310e56c6c1014..f47dbc553007e320ca526514c26a18569ea19c8d 100644 GIT binary patch literal 822 zcmbu7uWrLI5XLi&PlJ1eJwYF!u+qq2Y2aXCX<=btXkcMrq)Ag~prN6u;lb?p`O>V~ zrjc28Q2Xfky%JFO zq$#_bLFh)Fp1LGcD6MO%d-VLglXX`U>fFqwaN!nc?S+PqSVX&$Y@trIwideI5RAK=ko>1zP%nyL)kUy%L!o*M>!A& zyfuePyWA^Lh{7vOD21k96Q1;~q3qq(WobF$NcZI(`-_70X-RKdivs2S%_!N0lOQHH znQmC;@=F3SbtiH8hy$|1!g$ss{T`0tq$&yTPy`BhWB@;};xykV$4cAt6LN(lE(jv!802COcvj6}9 delta 192 zcmdnSwvBCq*~EqN6E_G<+`uw1Q;YLI7#wH_1&gwBF3aLLmlCmSlo!_e3x&nP7U(O^%1^xwfhks^=z?7Tm!A#NT(Y diff --git a/PowerEditor/src/icons/project_work_space_dirty.bmp b/PowerEditor/src/icons/project_work_space_dirty.bmp index 6c539f013079e288f3a6f57bb02ccec6b24e9bc3..7685aba0c7fb70754c2b1420d05bfa90df72d0d2 100644 GIT binary patch delta 278 zcmdnSwvBCqnehSA!Ng20PKYjB+nW>TEAo84`(0D>G(>3PNi8-g>nDsgS(6dYj6^Uy x5zL*8Fe80@?m&&Svbq5=XtE>|T)QWNS;+*`6Bu|Gs;9d8DOAr*CM|OO1^^m!tf&A0 delta 278 zcmdnSwvBCqnel(p!Ng20PKYjB+nW>TEAo84`(0D>G(>3PNi8-g>nDsgS(6dYj6^Uy x5zL*8Fe80@?m&&Svbq5=XtE>|T)QWNS;+*`6Bu|Gs;9d8DOAr*CM|OO1^~-V*z^DZ