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

Set up the framework for handling Z-order and control IDs. Not actually used yet; we'll do that next.

This commit is contained in:
Pietro Gagliardi 2015-09-01 21:36:33 -04:00
parent 1bb98b2c61
commit 42f6d0f974
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
redo/ui_windows.h
View File

@ -15,6 +15,7 @@ struct uiWindowsControl {
void (*CommitSetParent)(uiWindowsControl *, HWND); void (*CommitSetParent)(uiWindowsControl *, HWND);
void (*MinimumSize)(uiWindowsControl *, uiWindowsSizing *, intmax_t *, intmax_t *); void (*MinimumSize)(uiWindowsControl *, uiWindowsSizing *, intmax_t *, intmax_t *);
void (*Relayout)(uiWindowsControl *, intmax_t, intmax_t, intmax_t, intmax_t); void (*Relayout)(uiWindowsControl *, intmax_t, intmax_t, intmax_t, intmax_t);
void (*AssignControlIDZOrder)(uiWindowsControl *, LONG_PTR *, HWND *);
}; };
_UI_EXTERN uintmax_t uiWindowsControlType(void); _UI_EXTERN uintmax_t uiWindowsControlType(void);
#define uiWindowsControl(this) ((uiWindowsControl *) uiIsA((this), uiWindowsControlType(), 1)) #define uiWindowsControl(this) ((uiWindowsControl *) uiIsA((this), uiWindowsControlType(), 1))
@ -52,7 +53,13 @@ _UI_EXTERN void uiWindowsControlQueueRelayout(uiWindowsControl *);
{ \ { \
uiWindowsEnsureMoveWindow(type(c)->hwnd, x, y, width, height); \ uiWindowsEnsureMoveWindow(type(c)->hwnd, x, y, width, height); \
} \ } \
static void minimumSize(uiWindowsControl *c, uiWindowsSizing *d, intmax_t *width, intmax_t *height); static void minimumSize(uiWindowsControl *c, uiWindowsSizing *d, intmax_t *width, intmax_t *height); \
static void _ ## type ## AssignControlIDZOrder(uiWindowsControl *c, LONG_PTR *controlID, HWND *insertAfter) \
{ \
uiWindowsEnsureAssignControlIDZOrder(type(c)->hwnd, *controlID, *insertAfter); \
(*controlID)++; \
*insertAfter = type(c)->hwnd; \
}
#define uiWindowsDefineControl(type, typefn) \ #define uiWindowsDefineControl(type, typefn) \
uiWindowsDefineControlWithOnDestroy(type, typefn, (void) this;) uiWindowsDefineControlWithOnDestroy(type, typefn, (void) this;)
@ -64,6 +71,7 @@ _UI_EXTERN void uiWindowsControlQueueRelayout(uiWindowsControl *);
uiWindowsControl(variable)->CommitSetParent = _ ## type ## CommitSetParent; \ uiWindowsControl(variable)->CommitSetParent = _ ## type ## CommitSetParent; \
uiWindowsControl(variable)->MinimumSize = minimumSize; \ uiWindowsControl(variable)->MinimumSize = minimumSize; \
uiWindowsControl(variable)->Relayout = _ ## type ## Relayout; \ uiWindowsControl(variable)->Relayout = _ ## type ## Relayout; \
uiWindowsControl(variable)->AssignControlIDZOrder = _ ## type ## AssignControlIDZOrder; \
uiWindowsFinishControl(uiControl(variable)); uiWindowsFinishControl(uiControl(variable));
// This is a function used to set up a control. // This is a function used to set up a control.
@ -81,6 +89,10 @@ _UI_EXTERN void uiWindowsEnsureSetParent(HWND hwnd, HWND parent);
// Use this in your Relayout() implementation to move and resize HWNDs. libui handles errors for you. // Use this in your Relayout() implementation to move and resize HWNDs. libui handles errors for you.
_UI_EXTERN void uiWindowsEnsureMoveWindow(HWND hwnd, intmax_t x, intmax_t y, intmax_t width, intmax_t height); _UI_EXTERN void uiWindowsEnsureMoveWindow(HWND hwnd, intmax_t x, intmax_t y, intmax_t width, intmax_t height);
// Use this in implementations of AssignControlIDZOrder().
// libui handles errors for you.
_UI_EXTERN void uiWindowsEnsureAssignControlIDZOrder(HWND hwnd, LONG_PTR controlID, HWND insertAfter);
//////////////////////////////////////////// ////////////////////////////////////////////
/////////////////// TODO /////////////////// /////////////////// TODO ///////////////////
//////////////////////////////////////////// ////////////////////////////////////////////

6
redo/windows/util.c
View File

@ -92,3 +92,9 @@ void uiWindowsEnsureSetParent(HWND hwnd, HWND parent)
if (SetParent(hwnd, parent) == 0) if (SetParent(hwnd, parent) == 0)
logLastError("error setting window parent in uiWindowsEnsureSetParent"); logLastError("error setting window parent in uiWindowsEnsureSetParent");
} }
void uiWindowsEnsureAssignControlIDZOrder(HWND hwnd, LONG_PTR controlID, HWND insertAfter)
{
SetWindowLongPtrW(hwnd, GWLP_ID, controlID);
setWindowInsertAfter(hwnd, insertAfter);
}