comparison: ui/motif/Grid.c
ui/motif/Grid.c
- branch
- newapi
- changeset 407
- 8ea123dd89db
- parent 406
- 0ebf9d7b23e8
- child 408
- b06e43f1edd4
equal
deleted
inserted
replaced
| 406:0ebf9d7b23e8 | 407:8ea123dd89db |
|---|---|
| 403 num_rows_expanding++; | 403 num_rows_expanding++; |
| 404 } | 404 } |
| 405 req_height += rows[i].size; | 405 req_height += rows[i].size; |
| 406 } | 406 } |
| 407 | 407 |
| 408 if(req_width > 0 && req_height > 0) { | |
| 409 Widget parent = w->core.parent; | |
| 410 Dimension rwidth = req_width; | |
| 411 Dimension rheight = req_height; | |
| 412 if(rwidth < w->core.width) { | |
| 413 //rwidth = w->core.width; | |
| 414 } | |
| 415 if(rheight < w->core.height) { | |
| 416 //rheight = w->core.height; | |
| 417 } | |
| 418 | |
| 419 if(!w->mywidget.sizerequest) { | |
| 420 Dimension actual_width, actual_height; | |
| 421 w->mywidget.sizerequest = TRUE; | |
| 422 XtMakeResizeRequest((Widget)w, req_width, req_height, &actual_width, &actual_height); | |
| 423 w->mywidget.sizerequest = FALSE; | |
| 424 //printf("size request: %d %d\n", (int)actual_width, (int)actual_height); | |
| 425 } | |
| 426 | |
| 427 | |
| 428 | |
| 429 } | |
| 430 | |
| 408 int hexpand = 0; | 431 int hexpand = 0; |
| 409 int width_diff = (int)w->core.width - req_width; | 432 int width_diff = (int)w->core.width - req_width; |
| 410 int hexpand2 = 0; | 433 int hexpand2 = 0; |
| 411 if(width_diff > 0 && num_cols_expanding > 0) { | 434 if(width_diff > 0 && num_cols_expanding > 0) { |
| 412 hexpand = width_diff / num_cols_expanding; | 435 hexpand = width_diff / num_cols_expanding; |
