Got rid of child.cpp. Yay. :D
This commit is contained in:
parent
affa6a7080
commit
abf9e202ef
|
@ -10,7 +10,6 @@ CXXFILES += \
|
|||
windows/box.cpp \
|
||||
windows/button.cpp \
|
||||
windows/checkbox.cpp \
|
||||
windows/child.cpp \
|
||||
windows/combobox.cpp \
|
||||
windows/container.cpp \
|
||||
windows/control.cpp \
|
||||
|
|
|
@ -1,175 +0,0 @@
|
|||
// 28 august 2015
|
||||
#include "uipriv_windows.hpp"
|
||||
|
||||
// This file contains helpers for managing child controls.
|
||||
|
||||
struct child {
|
||||
uiControl *c;
|
||||
HWND hwnd;
|
||||
|
||||
// This is a helper for uiTab pages.
|
||||
// For visual accuracy of tab page backgrounds, margins are also handled here, applied to the child only (rather than applied to the whole tab page).
|
||||
HWND tabpage;
|
||||
int margined;
|
||||
|
||||
// This flag is for users of these functions.
|
||||
// For uiBox, this is "spaced".
|
||||
int flag;
|
||||
|
||||
// These intmax_t variables are for users of these functions.
|
||||
// For uiBox, these are "width" and "height".
|
||||
intmax_t im[2];
|
||||
};
|
||||
|
||||
struct child *newChild(uiControl *child, uiControl *parent, HWND parentHWND)
|
||||
{
|
||||
struct child *c;
|
||||
uiWindowsControl *wc;
|
||||
|
||||
if (child == NULL)
|
||||
return NULL;
|
||||
|
||||
c = uiNew(struct child);
|
||||
c->c = child;
|
||||
c->hwnd = (HWND) uiControlHandle(c->c);
|
||||
|
||||
uiControlSetParent(c->c, parent);
|
||||
wc = uiWindowsControl(c->c);
|
||||
(*(wc->CommitSetParent))(wc, parentHWND);
|
||||
|
||||
return c;
|
||||
}
|
||||
|
||||
struct child *newChildWithTabPage(uiControl *child, uiControl *parent, HWND parentHWND)
|
||||
{
|
||||
struct child *c;
|
||||
HWND tabpage;
|
||||
|
||||
tabpage = newTabPage();
|
||||
c = newChild(child, parent, tabpage);
|
||||
uiWindowsEnsureSetParent(tabpage, parentHWND);
|
||||
c->tabpage = tabpage;
|
||||
return c;
|
||||
}
|
||||
|
||||
void childRemove(struct child *c)
|
||||
{
|
||||
uiWindowsEnsureSetParent(c->hwnd, utilWindow);
|
||||
uiControlSetParent(c->c, NULL);
|
||||
if (c->tabpage != NULL)
|
||||
uiWindowsEnsureDestroyWindow(c->tabpage);
|
||||
uiFree(c);
|
||||
}
|
||||
|
||||
void childDestroy(struct child *c)
|
||||
{
|
||||
uiControl *child;
|
||||
|
||||
child = c->c;
|
||||
childRemove(c);
|
||||
uiControlDestroy(child);
|
||||
}
|
||||
|
||||
HWND childHWND(struct child *c)
|
||||
{
|
||||
return c->hwnd;
|
||||
}
|
||||
|
||||
void childMinimumSize(struct child *c, uiWindowsSizing *d, intmax_t *width, intmax_t *height)
|
||||
{
|
||||
uiWindowsControl *wc;
|
||||
intmax_t left, top, right, bottom;
|
||||
|
||||
wc = uiWindowsControl(c->c);
|
||||
(*(wc->MinimumSize))(wc, d, width, height);
|
||||
if (c->tabpage != NULL && c->margined) {
|
||||
tabPageMargins(c->tabpage, &left, &top, &right, &bottom);
|
||||
*width += left + right;
|
||||
*height += top + bottom;
|
||||
}
|
||||
}
|
||||
|
||||
void childRelayout(struct child *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height)
|
||||
{
|
||||
uiWindowsControl *wc;
|
||||
intmax_t left, top, right, bottom;
|
||||
|
||||
if (c->tabpage != NULL) {
|
||||
uiWindowsEnsureMoveWindowDuringResize(c->tabpage, x, y, width, height);
|
||||
x = 0; // and make relative to the client rect of the tab page
|
||||
y = 0;
|
||||
if (c->margined) {
|
||||
tabPageMargins(c->tabpage, &left, &top, &right, &bottom);
|
||||
x += left;
|
||||
y += top;
|
||||
width -= left + right;
|
||||
height -= top + bottom;
|
||||
}
|
||||
}
|
||||
wc = uiWindowsControl(c->c);
|
||||
(*(wc->Relayout))(wc, x, y, width, height);
|
||||
}
|
||||
|
||||
void childQueueRelayout(struct child *c)
|
||||
{
|
||||
uiWindowsControlMinimumSizeChanged(uiWindowsControl(c->c));
|
||||
}
|
||||
|
||||
int childVisible(struct child *c)
|
||||
{
|
||||
return controlSelfVisible(c->c);
|
||||
}
|
||||
|
||||
void childUpdateState(struct child *c)
|
||||
{
|
||||
controlUpdateState(c->c);
|
||||
}
|
||||
|
||||
void childAssignControlIDZOrder(struct child *c, LONG_PTR *controlID, HWND *insertAfter)
|
||||
{
|
||||
uiWindowsControl *wc;
|
||||
|
||||
wc = uiWindowsControl(c->c);
|
||||
(*(wc->AssignControlIDZOrder))(wc, controlID, insertAfter);
|
||||
}
|
||||
|
||||
void childSetSoleControlID(struct child *c)
|
||||
{
|
||||
uiWindowsEnsureAssignControlIDZOrder(c->hwnd, 100, NULL);
|
||||
}
|
||||
|
||||
HWND childTabPage(struct child *c)
|
||||
{
|
||||
return c->tabpage;
|
||||
}
|
||||
|
||||
int childMargined(struct child *c)
|
||||
{
|
||||
return c->margined;
|
||||
}
|
||||
|
||||
void childSetMargined(struct child *c, int margined)
|
||||
{
|
||||
c->margined = margined;
|
||||
uiWindowsControlMinimumSizeChanged(uiWindowsControl(c->c));
|
||||
}
|
||||
|
||||
int childFlag(struct child *c)
|
||||
{
|
||||
return c->flag;
|
||||
}
|
||||
|
||||
void childSetFlag(struct child *c, int flag)
|
||||
{
|
||||
c->flag = flag;
|
||||
}
|
||||
|
||||
intmax_t childIntmax(struct child *c, int n)
|
||||
{
|
||||
return c->im[n];
|
||||
}
|
||||
|
||||
void childSetIntmax(struct child *c, int n, intmax_t to)
|
||||
{
|
||||
c->im[n] = to;
|
||||
}
|
|
@ -131,25 +131,3 @@ extern void tabPageMinimumSize(struct tabPage *tp, intmax_t *width, intmax_t *he
|
|||
|
||||
// TODO
|
||||
#include "_uipriv_migrate.hpp"
|
||||
|
||||
// TODO
|
||||
// child.cpp
|
||||
extern struct child *newChild(uiControl *child, uiControl *parent, HWND parentHWND);
|
||||
extern struct child *newChildWithTabPage(uiControl *child, uiControl *parent, HWND parentHWND);
|
||||
extern void childRemove(struct child *c);
|
||||
extern void childDestroy(struct child *c);
|
||||
extern HWND childHWND(struct child *c);
|
||||
extern void childMinimumSize(struct child *c, uiWindowsSizing *d, intmax_t *width, intmax_t *height);
|
||||
extern void childRelayout(struct child *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height);
|
||||
extern void childQueueRelayout(struct child *c);
|
||||
extern int childVisible(struct child *c);
|
||||
extern void childUpdateState(struct child *c);
|
||||
extern void childAssignControlIDZOrder(struct child *c, LONG_PTR *controlID, HWND *insertAfter);
|
||||
extern void childSetSoleControlID(struct child *c);
|
||||
extern HWND childTabPage(struct child *c);
|
||||
extern int childMargined(struct child *c);
|
||||
extern void childSetMargined(struct child *c, int margined);
|
||||
extern int childFlag(struct child *c);
|
||||
extern void childSetFlag(struct child *c, int flag);
|
||||
extern intmax_t childIntmax(struct child *c, int n);
|
||||
extern void childSetIntmax(struct child *c, int n, intmax_t to);
|
||||
|
|
Loading…
Reference in New Issue