Fixes balloon tooltips so that they can be drawn outside of the work area (required for system tray icons) and improves the shape of the tooltips so that they resemble their shape on Windows.
From: "Carl J. Bialorucki" cbialo2@outlook.com
--- dlls/comctl32/tooltips.c | 61 ++++++++++++++++++++++++---------------- dlls/win32u/region.c | 3 -- 2 files changed, 37 insertions(+), 27 deletions(-)
diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 95ef8da6794..c105b3ca7e4 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -22,11 +22,11 @@ * * This code was audited for completeness against the documented features * of Comctl32.dll version 6.0 on Sep. 08, 2004, by Robert Shearman. - * + * * Unless otherwise noted, we believe this code to be complete, as per * the specification mentioned above. * If you discover missing features or bugs please note them below. - * + * * TODO: * - Custom draw support. * - Animation. @@ -161,10 +161,10 @@ typedef struct #define BALLOON_TEXT_MARGIN (NORMAL_TEXT_MARGIN+8) /* value used for CreateRoundRectRgn that specifies how much * each corner is curved */ -#define BALLOON_ROUNDEDNESS 20 -#define BALLOON_STEMHEIGHT 13 -#define BALLOON_STEMWIDTH 10 -#define BALLOON_STEMINDENT 20 +#define BALLOON_ROUNDEDNESS 16 +#define BALLOON_STEMHEIGHT 18 +#define BALLOON_STEMWIDTH 18 +#define BALLOON_STEMINDENT 16
#define BALLOON_ICON_TITLE_SPACING 8 /* horizontal spacing between icon and title */ #define BALLOON_TITLE_TEXT_SPACING 8 /* vertical spacing between icon/title and main text */ @@ -307,7 +307,7 @@ TOOLTIPS_Refresh (const TOOLTIPS_INFO *infoPtr, HDC hdc) HFONT prevFont;
/* draw icon */ - icon_present = infoPtr->hTitleIcon && + icon_present = infoPtr->hTitleIcon && DrawIconEx(hdc, rc.left, rc.top, infoPtr->hTitleIcon, ICON_WIDTH, ICON_HEIGHT, 0, NULL, DI_NORMAL); if (icon_present) @@ -731,22 +731,35 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) mon_info.cbSize = sizeof(mon_info); GetMonitorInfoW( monitor, &mon_info );
- if( rect.right > mon_info.rcWork.right ) { - rect.left -= rect.right - mon_info.rcWork.right + 2; - rect.right = mon_info.rcWork.right - 2; + if (rect.right > mon_info.rcMonitor.right) + { + rect.left -= size.cx - (BALLOON_STEMINDENT + BALLOON_STEMWIDTH); + rect.right -= size.cx - (BALLOON_STEMINDENT + BALLOON_STEMWIDTH); + if (rect.right > mon_info.rcMonitor.right) + { + rect.left -= (rect.right - mon_info.rcMonitor.right); + rect.right = mon_info.rcMonitor.right; + } + } + if (rect.left < mon_info.rcMonitor.left) + { + rect.right += abs(rect.left); + rect.left = 0; } - if (rect.left < mon_info.rcWork.left) rect.left = mon_info.rcWork.left;
- if( rect.bottom > mon_info.rcWork.bottom ) { + if (rect.bottom > mon_info.rcMonitor.bottom) + { RECT rc; - - if (toolPtr->uFlags & TTF_IDISHWND) - GetWindowRect ((HWND)toolPtr->uId, &rc); - else { - rc = toolPtr->rect; - MapWindowPoints (toolPtr->hwnd, NULL, (LPPOINT)&rc, 2); - } - rect.bottom = rc.top - 2; + if (toolPtr->uFlags & TTF_IDISHWND) + { + GetWindowRect((HWND)toolPtr->uId, &rc); + } + else + { + rc = toolPtr->rect; + MapWindowPoints(toolPtr->hwnd, NULL, (LPPOINT)&rc, 2); + } + rect.bottom = rc.top - 2; rect.top = rect.bottom - size.cy; }
@@ -765,7 +778,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) { pts[0].x = ptfx; pts[0].y = 0; - pts[1].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); + pts[1].x = max(BALLOON_STEMINDENT, ptfx - BALLOON_STEMWIDTH); pts[1].y = BALLOON_STEMHEIGHT; pts[2].x = pts[1].x + BALLOON_STEMWIDTH; pts[2].y = pts[1].y; @@ -777,7 +790,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) } else { - pts[0].x = max(BALLOON_STEMINDENT, ptfx - (BALLOON_STEMWIDTH / 2)); + pts[0].x = max(BALLOON_STEMINDENT, ptfx - BALLOON_STEMWIDTH); pts[0].y = (rect.bottom - rect.top) - BALLOON_STEMHEIGHT; pts[1].x = pts[0].x + BALLOON_STEMWIDTH; pts[1].y = pts[0].y; @@ -791,7 +804,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) }
hrStem = CreatePolygonRgn(pts, ARRAY_SIZE(pts), ALTERNATE); - + hRgn = CreateRoundRectRgn(0, (infoPtr->bToolBelow ? BALLOON_STEMHEIGHT : 0), rect.right - rect.left, @@ -802,7 +815,7 @@ TOOLTIPS_Show (TOOLTIPS_INFO *infoPtr, BOOL track_activate) DeleteObject(hrStem);
SetWindowRgn(infoPtr->hwndSelf, hRgn, FALSE); - /* we don't free the region handle as the system deletes it when + /* we don't free the region handle as the system deletes it when * it is no longer needed */ }
diff --git a/dlls/win32u/region.c b/dlls/win32u/region.c index f32984d1c54..b15183b85f7 100644 --- a/dlls/win32u/region.c +++ b/dlls/win32u/region.c @@ -701,9 +701,6 @@ HRGN WINAPI NtGdiCreateRoundRectRgn( INT left, INT top, INT right, INT bottom,
if (left > right) { INT tmp = left; left = right; right = tmp; } if (top > bottom) { INT tmp = top; top = bottom; bottom = tmp; } - /* the region is for the rectangle interior, but only at right and bottom for some reason */ - right--; - bottom--;
ellipse_width = min( right - left, abs( ellipse_width )); ellipse_height = min( bottom - top, abs( ellipse_height ));
Hi,
It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated.
The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details:
The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=135893
Your paranoid android.
=== debian11b (64 bit WoW report) ===
gdi32: dib.c:1462: Test failed: 8888: wide pen: expected hash 657514a4ca1f2b6ca7a125ad58dfed82099a37d1 got 3b88006319571476e7170043743023f05729b7e2 dib.c:1462: Test failed: 8888 - bitfields: wide pen: expected hash 657514a4ca1f2b6ca7a125ad58dfed82099a37d1 got 3b88006319571476e7170043743023f05729b7e2 dib.c:1462: Test failed: a8b8g8r8: wide pen: expected hash 9988ceca44dafbee247aece1f027c06c27c01652 got defc332df97eab2315a030704cd804a563171232 dib.c:1462: Test failed: r10g10b10: wide pen: expected hash ce0fc29bb0281d6c955d64e239254ef9e6dbc06d got c5d3ffd602197a21444660167158f469ba95a84f dib.c:1462: Test failed: r6g6b6: wide pen: expected hash d67b897cad72d31e75359094007b1346fd8806ea got d2073fde7740f5369d206f9209e8620cf11bc936 dib.c:1462: Test failed: 24: wide pen: expected hash cf311a96d41bd98fdbdfb5dfaac4ba1ba9b7d6da got cc2d2c547984342beb7b850854bc850da68feb05 dib.c:1462: Test failed: r5g5b5: wide pen: expected hash 1c1499051860b7caa25173b328ca9c862f01dd1a got 7c1d0989006b071a3105a4a627c3eef113e1299e dib.c:1462: Test failed: r4g4b4: wide pen: expected hash 5505d2ed20dc61ffe48832ecf5329162a5ceb734 got 34e55512c02a7c1e283c7fb8247d6bebc91c341c dib.c:1462: Test failed: 8 color: wide pen: expected hash 2c07272462c68cf5944b03e2aa049475b99143c5 got 0054e585fda0150bfb27287af2cc4fe9cbf153c6 dib.c:1462: Test failed: 8 grayscale: wide pen: expected hash 1918a33f59d3500204ffc573318a39e9ff754221 got fbb5cf80c6696fde4fe16dd38a88a257d3c2e72e dib.c:1462: Test failed: 8: wide pen: expected hash f81c70b6ee2d4690f9f7c797c66582b176f8dcef got 04e6e80c6a5fec35f5df3fb2157d73cdafd2e31b dib.c:1462: Test failed: 4: wide pen: expected hash 297f6ad15200bffbf15198324ee8f27a61a6f2d4 got e52a353e1534710797e5cf9953aff79ea9d1c376 dib.c:1462: Test failed: 4 grayscale: wide pen: expected hash 58f400c9bb78e49a879276fb049edfc9c981740a got 3bdbcbd00f9735c785af72e1d730175024c6bd4b dib.c:1462: Test failed: 1: wide pen: expected hash 55c26d22f11d80b73383fa57d0fac552d705b092 got fef9f848f67c87e5b0d9085e476a60c3c4e871be dib.c:1462: Test failed: 1 ddb: wide pen: expected hash ee08e9d1b7741f01c234ab8ee15e43792a00fa9a got 3f76f6788b43e7b84533dac5a32b4f2b79bdc756 dib.c:1462: Test failed: 1 ddb custom colors inverted: wide pen: expected hash ee08e9d1b7741f01c234ab8ee15e43792a00fa9a got 3f76f6788b43e7b84533dac5a32b4f2b79bdc756
gdiplus: region.c:1093: Test failed: Got 000000ec
-
Carl Bialorucki (＠cbialorucki) -
Carl J. Bialorucki
-
Marvin