diff options
| author | Pietro Gagliardi <[email protected]> | 2015-04-09 17:46:26 -0400 |
|---|---|---|
| committer | Pietro Gagliardi <[email protected]> | 2015-04-09 17:46:26 -0400 |
| commit | cba301abbc9af3b3a8d005c5e716349cdf877cc1 (patch) | |
| tree | ed448f6f3975b9dd6665ccfbd58d1bd77c27946d /new/container_windows.c | |
| parent | 5c06fc512b3a62ba5f01286e2363339886228cf9 (diff) | |
More Windows conversion. Not done yet.
Diffstat (limited to 'new/container_windows.c')
| -rw-r--r-- | new/container_windows.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/new/container_windows.c b/new/container_windows.c index 8881c10..2f05711 100644 --- a/new/container_windows.c +++ b/new/container_windows.c @@ -62,6 +62,7 @@ BOOL sharedWndProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam, LRESULT * void resize(uiControl *control, HWND parent, RECT r, RECT margin) { uiSizing d; + uiSizingSys sys; HDC dc; HFONT prevfont; TEXTMETRICW tm; @@ -80,9 +81,9 @@ void resize(uiControl *control, HWND parent, RECT r, RECT margin) logLastError("error getting text metrics in resize()"); if (GetTextExtentPoint32W(dc, L"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz", 52, &size) == 0) logLastError("error getting text extent point in resize()"); - d.baseX = (int) ((size.cx / 26 + 1) / 2); - d.baseY = (int) tm.tmHeight; - d.internalLeading = tm.tmInternalLeading; + sys.baseX = (int) ((size.cx / 26 + 1) / 2); + sys.baseY = (int) tm.tmHeight; + sys.internalLeading = tm.tmInternalLeading; if (SelectObject(dc, prevfont) != hMessageFont) logLastError("error restoring previous font into device context in resize()"); if (ReleaseDC(parent, dc) == 0) @@ -93,7 +94,8 @@ void resize(uiControl *control, HWND parent, RECT r, RECT margin) r.bottom -= uiDlgUnitToY(margin.bottom, d.baseY); d.xPadding = uiDlgUnitToX(winXPadding, d.baseX); d.yPadding = uiDlgUnitToY(winYPadding, d.baseY); - (*(control->resize))(control, r.left, r.top, r.right - r.left, r.bottom - r.top, &d); + d.sys = &sys; + uiControlResize(control, r.left, r.top, r.right - r.left, r.bottom - r.top, &d); } void updateParent(uintptr_t h) |