interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More Windows popover error checking and bug fixes.

This commit is contained in:
Pietro Gagliardi 2014-10-10 12:25:14 -04:00
parent 8a74b95fcf
commit 1fc82c55f4
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
windowspopover/main.c
View File

@ -25,7 +25,6 @@
// - investigate visual styles // - investigate visual styles
// - put the client and non-client areas in the right place // - put the client and non-client areas in the right place
// - make sure redrawing is correct (especially for backgrounds) // - make sure redrawing is correct (especially for backgrounds)
// - wine: BLACK_PEN draws a white line? (might change later so eh)
// - should the parent window appear deactivated? // - should the parent window appear deactivated?
HWND popover; HWND popover;
@ -49,13 +48,14 @@ struct popover {
LONG arrowBottom; LONG arrowBottom;
}; };
struct popover _p = { NULL, -1, -1, 20, -1 };
struct popover *p = &_p;
HRGN makePopoverRegion(HDC dc, LONG width, LONG height) HRGN makePopoverRegion(HDC dc, LONG width, LONG height)
{ {
POINT pt[20]; POINT pt[20];
int n; int n;
HRGN region; HRGN region;
struct popover _p = { NULL, -1, -1, 20, -1 };
struct popover *p = &_p;
LONG xmax, ymax; LONG xmax, ymax;
if (BeginPath(dc) == 0) if (BeginPath(dc) == 0)
@ -162,6 +162,7 @@ LRESULT CALLBACK popoverproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
LONG width; LONG width;
LONG height; LONG height;
WINDOWPOS *wp; WINDOWPOS *wp;
HBRUSH brush;
switch (uMsg) { switch (uMsg) {
case WM_NCPAINT: case WM_NCPAINT:
@ -173,11 +174,18 @@ LRESULT CALLBACK popoverproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
if (dc == NULL) if (dc == NULL)
xpanic("error getting Popover window DC for drawing border", GetLastError()); xpanic("error getting Popover window DC for drawing border", GetLastError());
region = makePopoverRegion(dc, width, height); region = makePopoverRegion(dc, width, height);
// TODO isolate the class brush to a constant // TODO isolate the brush name to a constant
// TODO object errors (or switch to path functions?) // unfortunately FillRgn() doesn't document the COLOR+1 trick as working there
if (FillRgn(dc, region, GetSysColorBrush(COLOR_BTNFACE)) == 0) brush = GetSysColorBrush(COLOR_BTNFACE);
if (brush == NULL)
xpanic("error getting Popover background brush", GetLastError());
if (FillRgn(dc, region, brush) == 0)
xpanic("error drawing Popover background", GetLastError()); xpanic("error drawing Popover background", GetLastError());
if (FrameRgn(dc, region, GetStockObject(BLACK_PEN), 1, 1) == 0) // TODO use a system color brush?
brush = (HBRUSH) GetStockObject(BLACK_BRUSH);
if (brush == NULL)
xpanic("error getting Popover border brush", GetLastError());
if (FrameRgn(dc, region, brush, 1, 1) == 0)
xpanic("error drawing Popover border", GetLastError()); xpanic("error drawing Popover border", GetLastError());
if (DeleteObject(region) == 0) if (DeleteObject(region) == 0)
xpanic("error deleting Popover shape region", GetLastError()); xpanic("error deleting Popover shape region", GetLastError());
@ -217,7 +225,7 @@ LRESULT CALLBACK popoverproc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
dc = BeginPaint(hwnd, &ps); dc = BeginPaint(hwnd, &ps);
GetClientRect(hwnd, &r); GetClientRect(hwnd, &r);
FillRect(dc, &r, GetSysColorBrush(COLOR_ACTIVECAPTION)); FillRect(dc, &r, GetSysColorBrush(COLOR_ACTIVECAPTION));
FrameRect(dc, &r, GetStockPen(WHITE_PEN)); FrameRect(dc, &r, GetStockPen(WHITE_BRUSH));
EndPaint(hwnd, &ps); EndPaint(hwnd, &ps);
return 0; return 0;
} }