comparison: ui/gtk/container.c
ui/gtk/container.c
- changeset 732
- 3920f803ef19
- parent 731
- 8487d11b9491
- child 765
- ee08f7859b78
equal
deleted
inserted
replaced
| 731:8487d11b9491 | 732:3920f803ef19 |
|---|---|
| 199 } | 199 } |
| 200 if(grid->def_vexpand) { | 200 if(grid->def_vexpand) { |
| 201 vexpand = TRUE; | 201 vexpand = TRUE; |
| 202 } | 202 } |
| 203 if(grid->def_vfill) { | 203 if(grid->def_vfill) { |
| 204 vexpand = TRUE; | 204 vfill = TRUE; |
| 205 } | 205 } |
| 206 } | 206 } |
| 207 | 207 |
| 208 UiBool fill = ct->layout.fill; | 208 UiBool fill = ct->layout.fill; |
| 209 if(ct->layout.hexpand) { | 209 if(ct->layout.hexpand) { |
| 210 hexpand = TRUE; | 210 hexpand = TRUE; |
| 211 hfill = TRUE; | 211 } |
| 212 } else if(ct->layout.hfill) { | 212 if(ct->layout.hfill) { |
| 213 hfill = TRUE; | 213 hfill = TRUE; |
| 214 } | 214 } |
| 215 if(ct->layout.vexpand) { | 215 if(ct->layout.vexpand) { |
| 216 vexpand = TRUE; | 216 vexpand = TRUE; |
| 217 vfill = TRUE; | 217 } |
| 218 } else if(ct->layout.vfill) { | 218 if(ct->layout.vfill) { |
| 219 vfill = TRUE; | 219 vfill = TRUE; |
| 220 } | 220 } |
| 221 if(fill) { | 221 if(fill) { |
| 222 hfill = TRUE; | 222 hfill = TRUE; |
| 223 vfill = TRUE; | 223 vfill = TRUE; |
| 224 hexpand = TRUE; | |
| 225 vexpand = TRUE; | |
| 224 } | 226 } |
| 225 | 227 |
| 226 if(!hfill) { | 228 if(!hfill) { |
| 227 gtk_widget_set_halign(widget, GTK_ALIGN_START); | 229 gtk_widget_set_halign(widget, GTK_ALIGN_START); |
| 228 } | 230 } |
