interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed the uiContainer code on Windows to use WM_PRINTCLIENT directly instead of creating the brush each time. Thanks to Barmak Shemirani (http://stackoverflow.com/questions/30066108/brush-origin-patblt-and-mapwindowrect-confusion) for inspiring me with this solution that I should have thought of myself =P

This commit is contained in:
Pietro Gagliardi 2015-05-06 02:20:08 -04:00
parent 2c7bccb3a8
commit 7e0d79713b
1 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
windows/container.c
View File

@ -12,15 +12,10 @@ struct container {
HBRUSH brush; HBRUSH brush;
}; };
// see http://www.codeproject.com/Articles/5978/Correctly-drawn-themed-dialogs-in-WinXP static HWND realParent(HWND hwnd)
static HBRUSH getControlBackgroundBrush(HWND hwnd, HDC dc, RECT *hwndScreenRect)
{ {
HWND parent; HWND parent;
RECT parentRect;
int class; int class;
HDC cdc;
HBITMAP bitmap, prevbitmap;
HBRUSH brush;
parent = hwnd; parent = hwnd;
for (;;) { for (;;) {
@ -31,6 +26,19 @@ static HBRUSH getControlBackgroundBrush(HWND hwnd, HDC dc, RECT *hwndScreenRect)
if (class != 0 && class != 1) if (class != 0 && class != 1)
break; break;
} }
return parent;
}
// see http://www.codeproject.com/Articles/5978/Correctly-drawn-themed-dialogs-in-WinXP
static HBRUSH getControlBackgroundBrush(HWND hwnd, HDC dc)
{
HWND parent;
RECT parentRect, hwndScreenRect;
HDC cdc;
HBITMAP bitmap, prevbitmap;
HBRUSH brush;
parent = realParent(hwnd);
if (GetClientRect(parent, &parentRect) == 0) if (GetClientRect(parent, &parentRect) == 0)
logLastError("error getting parent's client rect in getControlBackgroundBrush()"); logLastError("error getting parent's client rect in getControlBackgroundBrush()");
@ -56,33 +64,33 @@ static HBRUSH getControlBackgroundBrush(HWND hwnd, HDC dc, RECT *hwndScreenRect)
if (DeleteDC(cdc) == 0) if (DeleteDC(cdc) == 0)
logLastError("error deleting compatible DC in getControlBackgroundBrush()"); logLastError("error deleting compatible DC in getControlBackgroundBrush()");
// the given control rect is in screen coordinates; convert to parent coordinates // now figure out where the control is relative to the parent so we can align the brush properly
mapWindowRect(NULL, parent, hwndScreenRect); if (GetWindowRect(hwnd, &hwndScreenRect) == 0)
if (SetBrushOrgEx(dc, -hwndScreenRect->left, -hwndScreenRect->top, NULL) == 0) logLastError("error getting control window rect in getControlBackgroundBrush()");
// this will be in screen coordinates; convert to parent coordinates
mapWindowRect(NULL, parent, &hwndScreenRect);
if (SetBrushOrgEx(dc, -hwndScreenRect.left, -hwndScreenRect.top, NULL) == 0)
logLastError("error setting brush origin in getControlBackgroundBrush()"); logLastError("error setting brush origin in getControlBackgroundBrush()");
return brush; return brush;
} }
// TODO this doesn't work right for partial redraws // TODO this needs to respect clipping
static void paintContainerBackground(HWND hwnd, HDC dc, RECT *paintRect) static void paintContainerBackground(HWND hwnd, HDC dc, RECT *paintRect)
{ {
RECT screenRect; HWND parent;
HBRUSH brush, prevbrush; RECT r;
POINT prevOrigin;
// getControlBackgroundBrush() needs a screen rectangle parent = realParent(hwnd);
screenRect = *paintRect;
mapWindowRect(hwnd, NULL, &screenRect); if (GetWindowRect(hwnd, &r) == 0)
brush = getControlBackgroundBrush(hwnd, dc, &screenRect); logLastError("error getting window rect in paintContainerBackground()");
prevbrush = SelectObject(dc, brush); mapWindowRect(NULL, parent, &r);
if (prevbrush == NULL) // TODO check errors
logLastError("error selecting background brush into DC in paintContainerBackground()"); SetWindowOrgEx(dc, r.left, r.top, &prevOrigin);
if (PatBlt(dc, paintRect->left, paintRect->top, paintRect->right - paintRect->left, paintRect->bottom - paintRect->top, PATCOPY) == 0) SendMessageW(parent, WM_PRINTCLIENT, (WPARAM) dc, PRF_CLIENT);
logLastError("error drawing container background in paintContainerBackground()"); SetWindowOrgEx(dc, prevOrigin.x, prevOrigin.y, NULL);
if (SelectObject(dc, prevbrush) != brush)
logLastError("error selecting previous brush back into DC in paintContainerBackground()");
if (DeleteObject(brush) == 0)
logLastError("error deleting background brush in paintContainerBackground()");
} }
// from https://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing and https://msdn.microsoft.com/en-us/library/windows/desktop/bb226818%28v=vs.85%29.aspx // from https://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing and https://msdn.microsoft.com/en-us/library/windows/desktop/bb226818%28v=vs.85%29.aspx
@ -183,9 +191,7 @@ static LRESULT CALLBACK containerWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LP
return DefWindowProcW(hwnd, uMsg, wParam, lParam); return DefWindowProcW(hwnd, uMsg, wParam, lParam);
*/ if (SetBkMode((HDC) wParam, TRANSPARENT) == 0) */ if (SetBkMode((HDC) wParam, TRANSPARENT) == 0)
logLastError("error setting transparent background mode to controls in containerWndProc()"); logLastError("error setting transparent background mode to controls in containerWndProc()");
if (GetWindowRect((HWND) lParam, &r) == 0) c->brush = getControlBackgroundBrush((HWND) lParam, (HDC) wParam);
logLastError("error getting control's window rect in containerWndProc()");
c->brush = getControlBackgroundBrush((HWND) lParam, (HDC) wParam, &r);
return (LRESULT) (c->brush); return (LRESULT) (c->brush);
case WM_PAINT: case WM_PAINT:
if (cc == NULL) if (cc == NULL)