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

Merge b9f52ef416 into fea45b2d5b

This commit is contained in:
Andrew Palmer 2021-01-02 10:22:14 -05:00 committed by GitHub
parent fea45b2d5b b9f52ef416
commit d72723a9ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
windows/colorbutton.cpp
View File

@ -61,7 +61,9 @@ static BOOL onWM_NOTIFY(uiControl *c, HWND hwnd, NMHDR *nmhdr, LRESULT *lResult)
ID2D1SolidColorBrush *brush; ID2D1SolidColorBrush *brush;
uiWindowsSizing sizing; uiWindowsSizing sizing;
int x, y; int x, y;
float dpi_x, dpi_y;
HRESULT hr; HRESULT hr;
D2D1_MATRIX_3X2_F dm;
if (nmhdr->code != NM_CUSTOMDRAW) if (nmhdr->code != NM_CUSTOMDRAW)
return FALSE; return FALSE;
@ -73,6 +75,13 @@ static BOOL onWM_NOTIFY(uiControl *c, HWND hwnd, NMHDR *nmhdr, LRESULT *lResult)
rt = makeHDCRenderTarget(nm->hdc, &client); rt = makeHDCRenderTarget(nm->hdc, &client);
rt->BeginDraw(); rt->BeginDraw();
// scale Direct2D's rendering to be in pixels instead of DIPs
rt->GetDpi(&dpi_x, &dpi_y);
ZeroMemory(&dm, sizeof (D2D1_MATRIX_3X2_F));
dm._11 = 96.f/dpi_x;
dm._22 = 96.f/dpi_y;
rt->SetTransform(&dm);
uiWindowsGetSizing(b->hwnd, &sizing); uiWindowsGetSizing(b->hwnd, &sizing);
x = 3; // should be enough x = 3; // should be enough
y = 3; y = 3;

2
windows/init.cpp
View File

@ -71,7 +71,7 @@ const char *uiInit(uiInitOptions *o)
if ((si.dwFlags & STARTF_USESHOWWINDOW) != 0) if ((si.dwFlags & STARTF_USESHOWWINDOW) != 0)
nCmdShow = si.wShowWindow; nCmdShow = si.wShowWindow;
// LONGTERM set DPI awareness SetProcessDPIAware();
hDefaultIcon = LoadIconW(NULL, IDI_APPLICATION); hDefaultIcon = LoadIconW(NULL, IDI_APPLICATION);
if (hDefaultIcon == NULL) if (hDefaultIcon == NULL)