From 2107595ce71ff91466ebef5a9f463ad0eed0325c Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Thu, 7 May 2015 14:33:46 -0400 Subject: [PATCH] "Exported" uiSizing fields. --- box.c | 8 ++++---- darwin/container.m | 4 ++-- ui.idl | 6 +++--- unix/container.c | 12 ++++++------ windows/bin.c | 12 ++++++------ windows/button.c | 2 +- windows/checkbox.c | 4 ++-- windows/container.c | 10 +++++----- windows/entry.c | 4 ++-- windows/label.c | 2 +- windows/newcontrol.c | 4 ++-- 11 files changed, 34 insertions(+), 34 deletions(-) diff --git a/box.c b/box.c index 0031a206..8918b2d7 100644 --- a/box.c +++ b/box.c @@ -69,8 +69,8 @@ static void boxPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_ xpadding = 0; ypadding = 0; if (b->padded) { - xpadding = d->xPadding; - ypadding = d->yPadding; + xpadding = d->XPadding; + ypadding = d->YPadding; } // 1) initialize the desired rect with the needed padding @@ -140,8 +140,8 @@ static void boxResizeChildren(uiContainer *c, intmax_t x, intmax_t y, intmax_t w xpadding = 0; ypadding = 0; if (b->padded) { - xpadding = d->xPadding; - ypadding = d->yPadding; + xpadding = d->XPadding; + ypadding = d->YPadding; } // 0) inset the available rect by the needed padding diff --git a/darwin/container.m b/darwin/container.m index 10f10a01..a236d33b 100644 --- a/darwin/container.m +++ b/darwin/container.m @@ -35,8 +35,8 @@ y = [self bounds].origin.y; width = [self bounds].size.width; height = [self bounds].size.height; - d.xPadding = macXPadding; - d.yPadding = macYPadding; + d.XPadding = macXPadding; + d.YPadding = macYPadding; uiContainerResizeChildren(self->c, x, y, width, height, &d); } diff --git a/ui.idl b/ui.idl index cb631145..6bc4585d 100644 --- a/ui.idl +++ b/ui.idl @@ -26,9 +26,9 @@ func FreeText(text *char); raw "typedef struct uiSizingSys uiSizingSys;"; struct Sizing { - field xPadding intmax_t; - field yPadding intmax_t; - field sys *uiSizingSys; + field XPadding intmax_t; + field YPadding intmax_t; + field Sys *uiSizingSys; }; raw "typedef struct uiControlSysFuncParams uiControlSysFuncParams;"; diff --git a/unix/container.c b/unix/container.c index 3966851b..749e1e8c 100644 --- a/unix/container.c +++ b/unix/container.c @@ -70,8 +70,8 @@ static void containerWidget_size_allocate(GtkWidget *widget, GtkAllocation *allo uiSizing d; gtk_widget_set_allocation(GTK_WIDGET(c), allocation); - d.xPadding = gtkXPadding; - d.yPadding = gtkYPadding; + d.XPadding = gtkXPadding; + d.YPadding = gtkYPadding; uiContainerResizeChildren(c->c, allocation->x, allocation->y, allocation->width, allocation->height, &d); } @@ -81,8 +81,8 @@ static void containerWidget_get_preferred_height(GtkWidget *widget, gint *minimu intmax_t width, height; uiSizing d; - d.xPadding = gtkXPadding; - d.yPadding = gtkYPadding; + d.XPadding = gtkXPadding; + d.YPadding = gtkYPadding; uiControlPreferredSize(uiControl(c->c), &d, &width, &height); *minimum = 0; // allow arbitrary resize *natural = height; @@ -94,8 +94,8 @@ static void containerWidget_get_preferred_width(GtkWidget *widget, gint *minimum intmax_t width, height; uiSizing d; - d.xPadding = gtkXPadding; - d.yPadding = gtkYPadding; + d.XPadding = gtkXPadding; + d.YPadding = gtkYPadding; uiControlPreferredSize(uiControl(c->c), &d, &width, &height); *minimum = 0; // allow arbitrary resize *natural = width; diff --git a/windows/bin.c b/windows/bin.c index a157f0b5..9e69a0f5 100644 --- a/windows/bin.c +++ b/windows/bin.c @@ -41,8 +41,8 @@ static void binPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_ return; } uiControlPreferredSize(b->mainControl, d, width, height); - marginX = uiWindowsDlgUnitsToX(b->marginLeft, d->sys->BaseX) + uiWindowsDlgUnitsToX(b->marginRight, d->sys->BaseX); - marginY = uiWindowsDlgUnitsToY(b->marginTop, d->sys->BaseY) + uiWindowsDlgUnitsToY(b->marginBottom, d->sys->BaseY); + marginX = uiWindowsDlgUnitsToX(b->marginLeft, d->Sys->BaseX) + uiWindowsDlgUnitsToX(b->marginRight, d->Sys->BaseX); + marginY = uiWindowsDlgUnitsToY(b->marginTop, d->Sys->BaseY) + uiWindowsDlgUnitsToY(b->marginBottom, d->Sys->BaseY); *width += marginX; *height += marginY; } @@ -62,12 +62,12 @@ static void binResizeChildren(uiContainer *c, intmax_t x, intmax_t y, intmax_t w if (b->mainControl == NULL) return; - marginLeft = uiWindowsDlgUnitsToX(b->marginLeft, d->sys->BaseX); - marginTop = uiWindowsDlgUnitsToY(b->marginTop, d->sys->BaseY); + marginLeft = uiWindowsDlgUnitsToX(b->marginLeft, d->Sys->BaseX); + marginTop = uiWindowsDlgUnitsToY(b->marginTop, d->Sys->BaseY); x += marginLeft; y += marginTop; - width -= marginLeft + uiWindowsDlgUnitsToX(b->marginRight, d->sys->BaseX); - height -= marginTop + uiWindowsDlgUnitsToY(b->marginBottom, d->sys->BaseY); + width -= marginLeft + uiWindowsDlgUnitsToX(b->marginRight, d->Sys->BaseX); + height -= marginTop + uiWindowsDlgUnitsToY(b->marginBottom, d->Sys->BaseY); uiControlResize(b->mainControl, x, y, width, height, d); } diff --git a/windows/button.c b/windows/button.c index cda43858..d14f1e4e 100644 --- a/windows/button.c +++ b/windows/button.c @@ -52,7 +52,7 @@ static void buttonPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intm // 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); + *height = uiWindowsDlgUnitsToY(buttonHeight, d->Sys->BaseY); } static void defaultOnClicked(uiButton *b, void *data) diff --git a/windows/checkbox.c b/windows/checkbox.c index a178118b..eab24300 100644 --- a/windows/checkbox.c +++ b/windows/checkbox.c @@ -48,8 +48,8 @@ static void checkboxPreferredSize(uiControl *cc, uiSizing *d, intmax_t *width, i { struct checkbox *c = (struct checkbox *) cc; - *width = uiWindowsDlgUnitsToX(checkboxXFromLeftOfBoxToLeftOfLabel, d->sys->BaseX) + uiWindowsWindowTextWidth(c->hwnd); - *height = uiWindowsDlgUnitsToY(checkboxHeight, d->sys->BaseY); + *width = uiWindowsDlgUnitsToX(checkboxXFromLeftOfBoxToLeftOfLabel, d->Sys->BaseX) + uiWindowsWindowTextWidth(c->hwnd); + *height = uiWindowsDlgUnitsToY(checkboxHeight, d->Sys->BaseY); } static void defaultOnToggled(uiCheckbox *c, void *data) diff --git a/windows/container.c b/windows/container.c index d383c2d0..8cc438c0 100644 --- a/windows/container.c +++ b/windows/container.c @@ -150,9 +150,9 @@ static HRESULT resize(uiContainer *cc, RECT *r) // the first control gets the topmost z-order and thus the first tab stop sys.InsertAfter = HWND_TOP; - d.xPadding = uiWindowsDlgUnitsToX(winXPadding, sys.BaseX); - d.yPadding = uiWindowsDlgUnitsToY(winYPadding, sys.BaseY); - d.sys = &sys; + d.XPadding = uiWindowsDlgUnitsToX(winXPadding, sys.BaseX); + d.YPadding = uiWindowsDlgUnitsToY(winYPadding, sys.BaseY); + d.Sys = &sys; uiContainerResizeChildren(cc, r->left, r->top, r->right - r->left, r->bottom - r->top, &d); return S_OK; } @@ -319,9 +319,9 @@ static void containerResize(uiControl *cc, intmax_t x, intmax_t y, intmax_t widt { struct container *c = (struct container *) (cc->Internal); - if (SetWindowPos(c->hwnd, d->sys->InsertAfter, x, y, width, height, SWP_NOACTIVATE | SWP_NOOWNERZORDER) == 0) + if (SetWindowPos(c->hwnd, d->Sys->InsertAfter, x, y, width, height, SWP_NOACTIVATE | SWP_NOOWNERZORDER) == 0) logLastError("error resizing uiContainer in containerResize()"); - d->sys->InsertAfter = c->hwnd; + d->Sys->InsertAfter = c->hwnd; // under some circumstances this might not be sufficient // example: check the Spaced checkbox; inside boxes will have been resized already before they get a chance to update their padded SendMessageW(c->hwnd, msgUpdateChild, 0, 0); diff --git a/windows/entry.c b/windows/entry.c index 48bd3219..3548fd92 100644 --- a/windows/entry.c +++ b/windows/entry.c @@ -37,8 +37,8 @@ static void onDestroy(void *data) static void entryPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height) { - *width = uiWindowsDlgUnitsToX(entryWidth, d->sys->BaseX); - *height = uiWindowsDlgUnitsToY(entryHeight, d->sys->BaseY); + *width = uiWindowsDlgUnitsToX(entryWidth, d->Sys->BaseX); + *height = uiWindowsDlgUnitsToY(entryHeight, d->Sys->BaseY); } static void defaultOnChanged(uiEntry *e, void *data) diff --git a/windows/label.c b/windows/label.c index 5cbdccbe..cb1a5460 100644 --- a/windows/label.c +++ b/windows/label.c @@ -31,7 +31,7 @@ static void labelPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intma struct label *l = (struct label *) c; *width = uiWindowsWindowTextWidth(l->hwnd); - *height = uiWindowsDlgUnitsToY(labelHeight, d->sys->BaseY); + *height = uiWindowsDlgUnitsToY(labelHeight, d->Sys->BaseY); } static char *labelText(uiLabel *l) diff --git a/windows/newcontrol.c b/windows/newcontrol.c index cbfb8fed..0e237793 100644 --- a/windows/newcontrol.c +++ b/windows/newcontrol.c @@ -55,9 +55,9 @@ static void singleResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, i { struct singleHWND *s = (struct singleHWND *) (c->Internal); - if (SetWindowPos(s->hwnd, d->sys->InsertAfter, x, y, width, height, SWP_NOACTIVATE | SWP_NOOWNERZORDER) == 0) + if (SetWindowPos(s->hwnd, d->Sys->InsertAfter, x, y, width, height, SWP_NOACTIVATE | SWP_NOOWNERZORDER) == 0) logLastError("error moving control in singleResize()"); - d->sys->InsertAfter = s->hwnd; + d->Sys->InsertAfter = s->hwnd; } static int singleVisible(uiControl *c)