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 | 230 +++++++++++++++++++++------------- dlls/hhctrl.ocx/resource.h | 4 +- 4 files changed, 146 insertions(+), 92 deletions(-) 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 zcmc(jYfMvj0L9yxxonZgG$U*}$IHYmAuthQZQL@)79JyjEZKrM2iW2W0)UJX*H2_&ht_Hu{_A(c(1EF9>ifRzBHJS-c|Q%N4%% ze`fmF!JHyY;zkZ5e1S>E1gezmqJG$xz?YNcwW5P&6=AOA=kbj21tu92s8V7>?RYir zMT5!Nd*D*~MFkd~Ki{;-XmB;)V$;6~V5$Kn-LClG;~z0OKAB-^>9sWD70zTNBDJIZ zKbe7CZS4^Rr$lcWPL=|DiYeLaDSY{hg~~O}x!M}+lzj&K^q@`qusz67F&lx4?=LKg zht;`HA#Eyz?(^)=$;WO#yP17@E@Iiy{f!@|f?e1rU(8l!x!J)r4rgFU^(eQ2I{nFLuh%C>5JaPeytjkmxdH4qbzW>)lg z)}RNoM7atOcH@8+4ZZEl`dnBTg^U3;Jd4jDxueuz@O78bMVoa6`bUSrR`YNd9Fha! zkpAVS*z5t~D!^uwbAO>K9((9N8TE*E%LbIxR_}hOcX$wNkzJ9bNP$MzwPiY2d^Ve$ z*A2D{5Sx*-X*hd)sKvMS;`iL@2U{e*sW*#U@!4#0PV-;pZgjU^d=gh*=8Uh;e!2LI zdsgE&M1KTxO8;5F09#;^F)<)dGueArpJqB!f?!VRH!#2!m}I=t;2p}^E}A?O+x;NNt!In)K1EpjyRcIf{m*)gH6)1ci{vx%^A;QWI*hk(cEFVVr Yhqi3GYEZzpeph*6J7wz_#=NHZ2gW}ur2qf` delta 190 zcmeyB^UFiU$+t>{0Su~uWDXD~0I>uRGcqVJFav1@m5nMd88@G0DrB74z`dE1wUlw< zIlj$4>_v>5>o^-2H}B&H690JX7&qGp09iFcKw^&wkoY48By1!>V$vWnS&*1KNK6SN zrqTq|tJc6cxlWyJGmB;w - + @@ -35,7 +35,7 @@ - + @@ -43,11 +43,11 @@ - + - + @@ -55,18 +55,18 @@ - + - + - + @@ -74,7 +74,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -108,115 +108,167 @@ - + - + - - - + + + - + - - + + - - + + - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + 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