From 442343a3db26a31ff12918dc42191abe85bcb120 Mon Sep 17 00:00:00 2001 From: Erich Hoover Date: Tue, 27 Sep 2011 08:11:36 -0600 Subject: [PATCH] hhctrl.ocx: Use separate icons for 'Hide' and 'Show' toolbar buttons based on the HIST_VIEWTREE icon. --- dlls/hhctrl.ocx/help.c | 4 +- dlls/hhctrl.ocx/hhtoolbar.bmp | Bin 9338 -> 13946 bytes dlls/hhctrl.ocx/hhtoolbar.svg | 496 +++++++++++++++++++++++------------------- dlls/hhctrl.ocx/resource.h | 4 +- 4 files changed, 279 insertions(+), 225 deletions(-) rewrite dlls/hhctrl.ocx/hhtoolbar.svg (68%) diff --git a/dlls/hhctrl.ocx/help.c b/dlls/hhctrl.ocx/help.c index fbb93d495cf..d710d3b9801 100644 --- a/dlls/hhctrl.ocx/help.c +++ b/dlls/hhctrl.ocx/help.c @@ -810,8 +810,8 @@ static void TB_AddButtonsFromFlags(HHInfo *pHHInfo, TBBUTTON *pButtons, DWORD dw if (dwButtonFlags & HHWIN_BUTTON_EXPAND) { - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_EXPAND, nHistBitmaps + HIST_VIEWTREE); - TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_CONTRACT, nHistBitmaps + HIST_VIEWTREE); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_EXPAND, nHHBitmaps + HHTB_EXPAND); + TB_AddButton(pButtons, (*pdwNumButtons)++, IDTB_CONTRACT, nHHBitmaps + HHTB_CONTRACT); if (pHHInfo->WinType.fNotExpanded) pButtons[1].fsState |= TBSTATE_HIDDEN; diff --git a/dlls/hhctrl.ocx/hhtoolbar.bmp b/dlls/hhctrl.ocx/hhtoolbar.bmp index 36fa4b576209548a442d45bc0ebca7fbb66268d2..c5c574f2ed1472bb60b3aca38092bf6078d930c4 100644 GIT binary patch delta 4315 zcwWVrYfMvT9LDL)T(-z%nh`dg<7VQP5SR$Dp15U>EnG$bS+WIj4zR@$q%DLhC9`rX zoq)7}ftHKhDi#)Q2M~rJH$f;j6=51QX19che%J>-uqDsVVc^#5OG*<@@_c!F@_YWj zyr=1Vx*E8e=y^0$;%~QhNth%uQ7~~~!m)F;+s1z2-{!f*DGv82Q$E>G+rJ{>NaZ1J zf93|e!j@r~cIy{`&n3dl6(~i!=pVMFa-{4+J@24R!!kDv2z)LPX0AXfa;A5@n*5)^ z%)&jB$+;-U^7H4LjyVG}e6H06w0OJxrH_APO9k}mYuRLlGqN;fbyX6{)+iKq*B?Pt zW)cx4jB(klM2&2>~a6I=Z#I416`s^7I{{I4cDS_$vyHNKvLDko|7K&2v5c5+3{7d-=t4PJ~7QjXV z;vFUhChpH5xKscy#R;69twYwsW*n?M4L@}}{L1)n%RPp|8yX_tltAOibvR3daG>-Q ze9L(7rPMqKXRC02UW-p^Mexcyj)h+zZ%$yv-bi5Nt`3JT#p1B)G|o;|!|O&0V&~N0 zFV=wn@CpR;HTbGE3-X?7BHxri!*C})RwY0@uL1u-75LPn8t@h>;d4_Afvy5!*Cco^ zD;&DTd&B}-?5HO&bY}uC=YtVYpN!;NA-R*nyo!kI?9>4qudt;9C>}`BWn!da{u=UJa?P4jGdg z6x?ZssJp~!f!h97MAV!^$y^7+y9z0#t4I2H4UREIxl>w%Y0}`GAB_jUJs}p*E4z#Y z#-?>^No!QXEB`o@GcBn8xfekd$q1=rlY$QmzCqDVEs<|ZKs(R@H|7x!W_UprA_P+9 zLMW!2p_=PLV5JDr^%te~Bk=zlgG<79U*v8l_WhaLptCsZy|q`H|6#cN4)z0%8|~^U%Q9h+f#Wba^JUx?Uo6Gvgcb8%8?05X#btP?O`Y zylpUk|E(dtuxnd6Z5fVlg1?p1=erZF7f!o6G~%v=HcHj}@1 z{cWZvGt#CpG_Y_lmk2XgpcK7BJGmyY@5HWu4=ds@b~)ZA8CJ%DWo{S{_*^2;T!B)w zmo9Nj;7AL?J&WZb?tigbwg}7058tQQFd*;`5rJk3iaAd2DlcrOT|8np{-*c`#y=~i delta 190 zcwYOJ^UFiU$+t>{0Su~uI0uLmfLH>E85tB9m_ZUM8&zI1Za&LY$T+cqdow3%DdWU* ze4BmPix@Z8aW*h+-p36j{_)l^ZnhBsvTB5Y#2yhK@kb0u*hqrJq(Ne`ATfE6m=Z`# zr3t84t$}fJojTiQ7R@Tg$@?_9HhXB7F;4!c&9}Knw}^4Fou1I<3;KCLH3njvMU1k5 NYK){dN0=lr0suMhJInw8 diff --git a/dlls/hhctrl.ocx/hhtoolbar.svg b/dlls/hhctrl.ocx/hhtoolbar.svg dissimilarity index 68% index 8622bfd79e0..4d8e5cc63f2 100644 --- a/dlls/hhctrl.ocx/hhtoolbar.svg +++ b/dlls/hhctrl.ocx/hhtoolbar.svg @@ -1,222 +1,274 @@ - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dlls/hhctrl.ocx/resource.h b/dlls/hhctrl.ocx/resource.h index 9d98ccfa068..560a0c3a662 100644 --- a/dlls/hhctrl.ocx/resource.h +++ b/dlls/hhctrl.ocx/resource.h @@ -38,4 +38,6 @@ #define HHTB_REFRESH 1 #define HHTB_HOME 2 #define HHTB_SYNC 3 -#define HHTB_NUMBITMAPS HHTB_SYNC +#define HHTB_CONTRACT 4 +#define HHTB_EXPAND 5 +#define HHTB_NUMBITMAPS HHTB_EXPAND -- 2.11.4.GIT