Migrated uiButton on Windows to the new backend. Most controls will, fortunately, be this smooth.
This commit is contained in:
parent
8b564c2427
commit
d4bb41f4c0
|
@ -0,0 +1,96 @@
|
|||
// 7 april 2015
|
||||
#include "uipriv_windows.h"
|
||||
|
||||
struct uiButton {
|
||||
uiWindowsControl c;
|
||||
HWND hwnd;
|
||||
void (*onClicked)(uiButton *, void *);
|
||||
void *onClickedData;
|
||||
};
|
||||
|
||||
uiDarwinDefineControlWithOnDestroy(
|
||||
uiButton, // type name
|
||||
uiButtonType, // type function
|
||||
uiWindowsUnregisterWM_COMMANDHandler(this->hwnd); // on destroy
|
||||
)
|
||||
|
||||
static BOOL onWM_COMMAND(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult)
|
||||
{
|
||||
uiButton *b = uiButton(c);
|
||||
|
||||
if (code != BN_CLICKED)
|
||||
return FALSE;
|
||||
(*(b->onClicked))(b, b->onClickedData);
|
||||
*lResult = 0;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
// from http://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing
|
||||
#define buttonHeight 14
|
||||
|
||||
static void minimumSize(uiControl *c, uiWindowsSizing *d, intmax_t *width, intmax_t *height)
|
||||
{
|
||||
uiButton *b = uiButton(c);
|
||||
SIZE size;
|
||||
|
||||
// try the comctl32 version 6 way
|
||||
size.cx = 0; // explicitly ask for ideal size
|
||||
size.cy = 0;
|
||||
if (SendMessageW(b->hwnd, BCM_GETIDEALSIZE, 0, (LPARAM) (&size)) != FALSE) {
|
||||
*width = size.cx;
|
||||
*height = size.cy;
|
||||
return;
|
||||
}
|
||||
|
||||
// that didn't work; fall back to using Microsoft's metrics
|
||||
// Microsoft says to use a fixed width for all buttons; this isn't good enough
|
||||
// use the text width instead, with some edge padding
|
||||
*width = uiWindowsWindowTextWidth(b->hwnd) + (2 * GetSystemMetrics(SM_CXEDGE));
|
||||
*height = uiWindowsDlgUnitsToY(buttonHeight, d->BaseY);
|
||||
}
|
||||
|
||||
static void defaultOnClicked(uiButton *b, void *data)
|
||||
{
|
||||
// do nothing
|
||||
}
|
||||
|
||||
char *uiButtonText(uiButton *b)
|
||||
{
|
||||
return uiWindowsUtilText(b->hwnd);
|
||||
}
|
||||
|
||||
void uiButtonSetText(uiButton *b, const char *text)
|
||||
{
|
||||
uiWindowsUtilSetText(b->hwnd, text);
|
||||
// changing the text might necessitate a change in the button's size
|
||||
uiControlQueueResize(uiControl(b));
|
||||
}
|
||||
|
||||
void uiButtonOnClicked(uiButton *b, void (*f)(uiButton *, void *), void *data)
|
||||
{
|
||||
b->onClicked = f;
|
||||
b->onClickedData = data;
|
||||
}
|
||||
|
||||
uiButton *uiNewButton(const char *text)
|
||||
{
|
||||
uiButton *b;
|
||||
WCHAR *wtext;
|
||||
|
||||
b = (uiButton *) uiNewControl(uiButtonType());
|
||||
|
||||
wtext = toUTF16(text);
|
||||
b->hwnd = uiWindowsEnsureCreateControlHWND(0,
|
||||
L"button", wtext,
|
||||
BS_PUSHBUTTON | WS_TABSTOP,
|
||||
hInstance, NULL,
|
||||
TRUE);
|
||||
uiFree(wtext);
|
||||
|
||||
uiWindowsRegisterWM_COMMANDHandler(b->hwnd, onWM_COMMAND, uiControl(b));
|
||||
uiButtonOnClicked(b, defaultOnClicked, NULL);
|
||||
|
||||
uiWindowsFinishNewControl(b, uiButton);
|
||||
|
||||
return b;
|
||||
}
|
122
windows/button.c
122
windows/button.c
|
@ -1,122 +0,0 @@
|
|||
// 7 april 2015
|
||||
#include "uipriv_windows.h"
|
||||
|
||||
struct button {
|
||||
uiButton b;
|
||||
HWND hwnd;
|
||||
void (*onClicked)(uiButton *, void *);
|
||||
void *onClickedData;
|
||||
void (*baseCommitDestroy)(uiControl *);
|
||||
};
|
||||
|
||||
uiDefineControlType(uiButton, uiTypeButton, struct button)
|
||||
|
||||
static BOOL onWM_COMMAND(uiControl *c, HWND hwnd, WORD code, LRESULT *lResult)
|
||||
{
|
||||
struct button *b = (struct button *) c;
|
||||
|
||||
if (code != BN_CLICKED)
|
||||
return FALSE;
|
||||
(*(b->onClicked))(uiButton(b), b->onClickedData);
|
||||
*lResult = 0;
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void buttonCommitDestroy(uiControl *c)
|
||||
{
|
||||
struct button *b = (struct button *) c;
|
||||
|
||||
uiWindowsUnregisterWM_COMMANDHandler(b->hwnd);
|
||||
(*(b->baseCommitDestroy))(uiControl(b));
|
||||
}
|
||||
|
||||
static uintptr_t buttonHandle(uiControl *c)
|
||||
{
|
||||
struct button *b = (struct button *) c;
|
||||
|
||||
return (uintptr_t) (b->hwnd);
|
||||
}
|
||||
|
||||
// from http://msdn.microsoft.com/en-us/library/windows/desktop/dn742486.aspx#sizingandspacing
|
||||
#define buttonHeight 14
|
||||
|
||||
static void buttonPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height)
|
||||
{
|
||||
struct button *b = (struct button *) c;
|
||||
SIZE size;
|
||||
|
||||
// try the comctl32 version 6 way
|
||||
size.cx = 0; // explicitly ask for ideal size
|
||||
size.cy = 0;
|
||||
if (SendMessageW(b->hwnd, BCM_GETIDEALSIZE, 0, (LPARAM) (&size)) != FALSE) {
|
||||
*width = size.cx;
|
||||
*height = size.cy;
|
||||
return;
|
||||
}
|
||||
|
||||
// that didn't work; fall back to using Microsoft's metrics
|
||||
// Microsoft says to use a fixed width for all buttons; this isn't good enough
|
||||
// use the text width instead, with some edge padding
|
||||
*width = uiWindowsWindowTextWidth(b->hwnd) + (2 * GetSystemMetrics(SM_CXEDGE));
|
||||
*height = uiWindowsDlgUnitsToY(buttonHeight, d->Sys->BaseY);
|
||||
}
|
||||
|
||||
static void defaultOnClicked(uiButton *b, void *data)
|
||||
{
|
||||
// do nothing
|
||||
}
|
||||
|
||||
static char *buttonText(uiButton *bb)
|
||||
{
|
||||
struct button *b = (struct button *) bb;
|
||||
|
||||
return uiWindowsUtilText(b->hwnd);
|
||||
}
|
||||
|
||||
static void buttonSetText(uiButton *bb, const char *text)
|
||||
{
|
||||
struct button *b = (struct button *) bb;
|
||||
|
||||
uiWindowsUtilSetText(b->hwnd, text);
|
||||
// changing the text might necessitate a change in the button's size
|
||||
uiControlQueueResize(uiControl(b));
|
||||
}
|
||||
|
||||
static void buttonOnClicked(uiButton *bb, void (*f)(uiButton *, void *), void *data)
|
||||
{
|
||||
struct button *b = (struct button *) bb;
|
||||
|
||||
b->onClicked = f;
|
||||
b->onClickedData = data;
|
||||
}
|
||||
|
||||
uiButton *uiNewButton(const char *text)
|
||||
{
|
||||
struct button *b;
|
||||
WCHAR *wtext;
|
||||
|
||||
b = (struct button *) uiWindowsNewSingleHWNDControl(uiTypeButton());
|
||||
|
||||
wtext = toUTF16(text);
|
||||
b->hwnd = uiWindowsUtilCreateControlHWND(0,
|
||||
L"button", wtext,
|
||||
BS_PUSHBUTTON | WS_TABSTOP,
|
||||
hInstance, NULL,
|
||||
TRUE);
|
||||
uiFree(wtext);
|
||||
|
||||
uiWindowsRegisterWM_COMMANDHandler(b->hwnd, onWM_COMMAND, uiControl(b));
|
||||
|
||||
b->onClicked = defaultOnClicked;
|
||||
|
||||
uiControl(b)->Handle = buttonHandle;
|
||||
uiControl(b)->PreferredSize = buttonPreferredSize;
|
||||
b->baseCommitDestroy = uiControl(b)->CommitDestroy;
|
||||
uiControl(b)->CommitDestroy = buttonCommitDestroy;
|
||||
|
||||
uiButton(b)->Text = buttonText;
|
||||
uiButton(b)->SetText = buttonSetText;
|
||||
uiButton(b)->OnClicked = buttonOnClicked;
|
||||
|
||||
return uiButton(b);
|
||||
}
|
Loading…
Reference in New Issue