Merge pull request #614 from mmozeiko/master

Correctly draw non-filled rectangle for GDI demo
This commit is contained in:
Micha Mettke 2018-01-30 00:17:04 -08:00 committed by GitHub
commit 614b3627c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions

View File

@ -170,6 +170,13 @@ nk_gdi_stroke_rect(HDC dc, short x, short y, unsigned short w,
unsigned short h, unsigned short r, unsigned short line_thickness, struct nk_color col)
{
COLORREF color = convert_color(col);
POINT points[] = {
{ x, y },
{ x + w, y },
{ x + w, y + h },
{ x, y + h },
{ x, y },
};
HPEN pen = NULL;
if (line_thickness == 1) {
@ -179,12 +186,7 @@ nk_gdi_stroke_rect(HDC dc, short x, short y, unsigned short w,
SelectObject(dc, pen);
}
SetDCBrushColor(dc, OPAQUE);
if (r == 0) {
Rectangle(dc, x, y, x + w, y + h);
} else {
RoundRect(dc, x, y, x + w, y + h, r, r);
}
Polyline(dc, points, 5);
if (pen) {
SelectObject(dc, GetStockObject(DC_PEN));