comparison: ui/gtk/container.c
ui/gtk/container.c
- branch
- newapi
- changeset 303
- dc8b504604f4
- parent 298
- c5e207d01ff2
- child 304
- d554b2a60105
equal
deleted
inserted
replaced
| 302:b00cbbfeec7a | 303:dc8b504604f4 |
|---|---|
| 148 } | 148 } |
| 149 if(ct->layout.vexpand != UI_LAYOUT_UNDEFINED) { | 149 if(ct->layout.vexpand != UI_LAYOUT_UNDEFINED) { |
| 150 vexpand = ct->layout.vexpand; | 150 vexpand = ct->layout.vexpand; |
| 151 } | 151 } |
| 152 | 152 |
| 153 if(hexpand) { | 153 gtk_widget_set_hexpand(widget, hexpand); |
| 154 gtk_widget_set_hexpand(widget, TRUE); | 154 gtk_widget_set_vexpand(widget, vexpand); |
| 155 } | |
| 156 if(vexpand) { | |
| 157 gtk_widget_set_vexpand(widget, TRUE); | |
| 158 } | |
| 159 | 155 |
| 160 int colspan = ct->layout.colspan > 0 ? ct->layout.colspan : 1; | 156 int colspan = ct->layout.colspan > 0 ? ct->layout.colspan : 1; |
| 161 int rowspan = ct->layout.rowspan > 0 ? ct->layout.rowspan : 1; | 157 int rowspan = ct->layout.rowspan > 0 ? ct->layout.rowspan : 1; |
| 162 | 158 |
| 163 gtk_grid_attach(GTK_GRID(ct->widget), widget, grid->x, grid->y, colspan, rowspan); | 159 gtk_grid_attach(GTK_GRID(ct->widget), widget, grid->x, grid->y, colspan, rowspan); |
