Hi,
This patch fixes the positioning in one of the states of the dropdown arrow
for the toolbar common control so that it is now centred. It also adds
support for the TBNRF_HIDEHELP flag in the customization dialog (but we don't
support when the flag is not used since the help button doesn't work).
Rob
Changelog:
- Make sure dropdown arrow is always centred
- Add support for the TBNRF_HIDEHELP customization flag, but emit a FIXME
when it isn't present
Index: wine/dlls/comctl32/toolbar.c
===================================================================
RCS file: /home/wine/wine/dlls/comctl32/toolbar.c,v
retrieving revision 1.136
diff -u -r1.136 toolbar.c
--- wine/dlls/comctl32/toolbar.c 5 Sep 2003 23:08:43 -0000 1.136
+++ wine/dlls/comctl32/toolbar.c 9 Sep 2003 18:35:44 -0000
@@ -917,7 +917,7 @@
#endif
if (hasDropDownArrow)
- TOOLBAR_DrawArrow(hdc, rcArrow.left+1, rcArrow.top, COLOR_WINDOWFRAME);
+ TOOLBAR_DrawArrow(hdc, rcArrow.left+1, rcArrow.top + (rcArrow.bottom - rcArrow.top - ARROW_HEIGHT) / 2, COLOR_WINDOWFRAME);
if (btnPtr->bHot) {
HIMAGELIST himlHot = GETHOTIMAGELIST(infoPtr,
@@ -1704,7 +1704,13 @@
if (TOOLBAR_SendNotify ((NMHDR *) &nmtb, infoPtr, TBN_INITCUSTOMIZE) ==
TBNRF_HIDEHELP)
{
- FIXME("TBNRF_HIDEHELP not supported\n");
+ TRACE("TBNRF_HIDEHELP requested\n");
+ ShowWindow(GetDlgItem(hwnd, IDC_HELP_BTN), SW_HIDE);
+ }
+ else
+ {
+ FIXME("Help button not implemented\n");
+ EnableWindow(GetDlgItem(hwnd, IDC_HELP_BTN), FALSE);
}
/* add items to 'toolbar buttons' list and check if removable */
