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

Migrated button.cpp. Allowed NULL out parameters in the uiWindowsSizing functions.

This commit is contained in:
Pietro Gagliardi 2016-04-29 12:18:46 -04:00
parent 4600bca8d3
commit f16f287b97
2 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
windows/button.cpp
View File

@ -8,11 +8,6 @@ struct uiButton {
void *onClickedData; void *onClickedData;
}; };
uiWindowsDefineControlWithOnDestroy(
uiButton, // type name
uiWindowsUnregisterWM_COMMANDHandler(me->hwnd); // on destroy
)
static BOOL onWM_COMMAND(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult) static BOOL onWM_COMMAND(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult)
{ {
uiButton *b = uiButton(c); uiButton *b = uiButton(c);
@ -24,13 +19,26 @@ static BOOL onWM_COMMAND(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult)
return TRUE; return TRUE;
} }
static void uiButtonDestroy(uiControl *c)
{
uiButton *b = uiButton(c);
uiWindowsUnregisterWM_COMMANDHandler(b->hwnd);
uiWindowsEnsureDestroyWindow(b->hwnd);
uiFreeControl(b->hwnd);
}
uiWindowsControlAllDefaultsExceptDestroy(uiButton)
// from http://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing // from http://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing
#define buttonHeight 14 #define buttonHeight 14
static void minimumSize(uiWindowsControl *c, uiWindowsSizing *d, intmax_t *width, intmax_t *height) static void uiButtonMinimumSize(uiWindowsControl *c, intmax_t *width, intmax_t *height)
{ {
uiButton *b = uiButton(c); uiButton *b = uiButton(c);
SIZE size; SIZE size;
uiWindowsSizing sizing;
int y;
// try the comctl32 version 6 way // try the comctl32 version 6 way
size.cx = 0; // explicitly ask for ideal size size.cx = 0; // explicitly ask for ideal size
@ -45,7 +53,10 @@ static void minimumSize(uiWindowsControl *c, uiWindowsSizing *d, intmax_t *width
// Microsoft says to use a fixed width for all buttons; this isn't good enough // Microsoft says to use a fixed width for all buttons; this isn't good enough
// use the text width instead, with some edge padding // use the text width instead, with some edge padding
*width = uiWindowsWindowTextWidth(b->hwnd) + (2 * GetSystemMetrics(SM_CXEDGE)); *width = uiWindowsWindowTextWidth(b->hwnd) + (2 * GetSystemMetrics(SM_CXEDGE));
*height = uiWindowsDlgUnitsToY(buttonHeight, d->BaseY); y = buttonHeight;
uiWindowsGetSizing(b->hwnd, &sizing);
uiWindowsSizingDlgUnitsToPixels(&sizing, NULL, &y);
*height = y;
} }
static void defaultOnClicked(uiButton *b, void *data) static void defaultOnClicked(uiButton *b, void *data)
@ -76,7 +87,7 @@ uiButton *uiNewButton(const char *text)
uiButton *b; uiButton *b;
WCHAR *wtext; WCHAR *wtext;
b = (uiButton *) uiNewControl(uiButton); uiWindowsNewControl(uiButton, b);
wtext = toUTF16(text); wtext = toUTF16(text);
b->hwnd = uiWindowsEnsureCreateControlHWND(0, b->hwnd = uiWindowsEnsureCreateControlHWND(0,
@ -89,7 +100,5 @@ uiButton *uiNewButton(const char *text)
uiWindowsRegisterWM_COMMANDHandler(b->hwnd, onWM_COMMAND, uiControl(b)); uiWindowsRegisterWM_COMMANDHandler(b->hwnd, onWM_COMMAND, uiControl(b));
uiButtonOnClicked(b, defaultOnClicked, NULL); uiButtonOnClicked(b, defaultOnClicked, NULL);
uiWindowsFinishNewControl(b, uiButton);
return b; return b;
} }

12
windows/sizing.cpp
View File

@ -39,8 +39,10 @@ void uiWindowsGetSizing(HWND hwnd, uiWindowsSizing *sizing);
void uiWindowsSizingDlgUnitsToPixels(uiWindowsSIzing *sizing, int *x, int *y) void uiWindowsSizingDlgUnitsToPixels(uiWindowsSIzing *sizing, int *x, int *y)
{ {
*x = dlgUnitsToX(*x, sizing->BaseX); if (x != NULL)
*y = dlgUnitsToY(*y, sizing->BaseY); *x = dlgUnitsToX(*x, sizing->BaseX);
if (y != NULL)
*y = dlgUnitsToY(*y, sizing->BaseY);
} }
// 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
@ -50,6 +52,8 @@ void uiWindowsSizingDlgUnitsToPixels(uiWindowsSIzing *sizing, int *x, int *y)
void uiWindowsSizingStandardPadding(uiWindowsSizing *sizing, int *x, int *y) void uiWindowsSizingStandardPadding(uiWindowsSizing *sizing, int *x, int *y)
{ {
*x = dlgUnitsToX(winXPadding, sizing->BaseX); if (x != NULL)
*y = dlgUnitsToY(winYPadding, sizing->BaseY); *x = dlgUnitsToX(winXPadding, sizing->BaseX);
if (y != NULL)
*y = dlgUnitsToY(winYPadding, sizing->BaseY);
} }