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

Oops forgot uiControlPreferredSize() in GTK+ uiControls; fixed.

This commit is contained in:
Pietro Gagliardi 2015-06-29 20:40:58 -04:00
parent b86fe98abd
commit 3acc1ed917
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
redo/unix/control.c
View File

@ -22,6 +22,16 @@ static void singleWidgetCommitSetParent(uiControl *c, uiControl *parent)
gtk_container_add(GTK_CONTAINER(newParent), WIDGET(c)); gtk_container_add(GTK_CONTAINER(newParent), WIDGET(c));
} }
static void singleWidgetPreferredSize(uiControl *c, uiSizing *d, intmax_t *width, intmax_t *height)
{
// use the natural height; it makes more sense
GtkAllocation natural;
gtk_widget_get_preferred_size(WIDGET(c), NULL, &natural);
*width = (intmax_t) (natural.width);
*height = (intmax_t) (natural.height);
}
static void singleWidgetResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d) static void singleWidgetResize(uiControl *c, intmax_t x, intmax_t y, intmax_t width, intmax_t height, uiSizing *d)
{ {
GtkAllocation a; GtkAllocation a;
@ -84,6 +94,7 @@ void uiUnixMakeSingleWidgetControl(uiControl *c, GtkWidget *widget)
uiControl(c)->CommitDestroy = singleWidgetCommitDestroy; uiControl(c)->CommitDestroy = singleWidgetCommitDestroy;
uiControl(c)->CommitSetParent = singleWidgetCommitSetParent; uiControl(c)->CommitSetParent = singleWidgetCommitSetParent;
uiControl(c)->PreferredSize = singleWidgetPreferredSize;
uiControl(c)->Resize = singleWidgetResize; uiControl(c)->Resize = singleWidgetResize;
uiControl(c)->Sizing = singleWidgetSizing; uiControl(c)->Sizing = singleWidgetSizing;
uiControl(c)->CommitShow = singleWidgetCommitShow; uiControl(c)->CommitShow = singleWidgetCommitShow;