comparison: ui/motif/Grid.c
ui/motif/Grid.c
- changeset 433
- 605bb5dc34f1
- parent 429
- 0921f8a5d535
equal
deleted
inserted
replaced
| 431:bb7da585debc | 433:605bb5dc34f1 |
|---|---|
| 206 sizeof (Boolean), | 206 sizeof (Boolean), |
| 207 XtOffsetOf( GridConstraintRec, | 207 XtOffsetOf( GridConstraintRec, |
| 208 grid.vfill), | 208 grid.vfill), |
| 209 XmRImmediate, | 209 XmRImmediate, |
| 210 (XtPointer) 0 | 210 (XtPointer) 0 |
| 211 } | 211 }, |
| 212 | 212 { |
| 213 gridMinWidth, | |
| 214 gridMinWidth, | |
| 215 XmRDimension, | |
| 216 sizeof (Dimension), | |
| 217 XtOffsetOf( GridConstraintRec, | |
| 218 grid.min_width), | |
| 219 XmRImmediate, | |
| 220 (XtPointer) 0 | |
| 221 } | |
| 213 }; | 222 }; |
| 214 //*/ | 223 //*/ |
| 215 | 224 |
| 216 GridClassRec gridClassRec = { | 225 GridClassRec gridClassRec = { |
| 217 // Core Class | 226 // Core Class |
| 413 constraints->grid.pref_width = child->core.width; | 422 constraints->grid.pref_width = child->core.width; |
| 414 } | 423 } |
| 415 if(constraints->grid.pref_height == 0) { | 424 if(constraints->grid.pref_height == 0) { |
| 416 constraints->grid.pref_height = child->core.height; | 425 constraints->grid.pref_height = child->core.height; |
| 417 } | 426 } |
| 427 if(constraints->grid.pref_width < constraints->grid.min_width) { | |
| 428 constraints->grid.pref_width = constraints->grid.min_width; | |
| 429 } | |
| 418 | 430 |
| 419 if(constraints->grid.colspan > span_max || constraints->grid.rowspan > span_max) { | 431 if(constraints->grid.colspan > span_max || constraints->grid.rowspan > span_max) { |
| 420 continue; | 432 continue; |
| 421 } | 433 } |
| 422 | 434 |
