comparison: ui/motif/Grid.c
ui/motif/Grid.c
- branch
- newapi
- changeset 424
- 51e856688fba
- parent 408
- b06e43f1edd4
- child 425
- effdc7283337
equal
deleted
inserted
replaced
| 423:02bafb660eb2 | 424:51e856688fba |
|---|---|
| 365 int num_cols_expanding = 0; | 365 int num_cols_expanding = 0; |
| 366 int num_rows_expanding = 0; | 366 int num_rows_expanding = 0; |
| 367 int req_width = 0; | 367 int req_width = 0; |
| 368 int req_height = 0; | 368 int req_height = 0; |
| 369 | 369 |
| 370 //printf("container width: %d\n", (int)w->core.width); | |
| 371 | |
| 370 // calculate the minimum size requirements for all columns and rows | 372 // calculate the minimum size requirements for all columns and rows |
| 371 // we need to run this 2 times: for widgets without colspan/rowspan first | 373 // we need to run this 2 times: for widgets without colspan/rowspan first |
| 372 // and then again for colspan/rowspan > 1 | 374 // and then again for colspan/rowspan > 1 |
| 373 int span_max = 1; | 375 int span_max = 1; |
| 374 for(int r=0;r<2;r++) { | 376 for(int r=0;r<2;r++) { |
| 489 } | 491 } |
| 490 | 492 |
| 491 if(!w->mywidget.sizerequest) { | 493 if(!w->mywidget.sizerequest) { |
| 492 Dimension actual_width, actual_height; | 494 Dimension actual_width, actual_height; |
| 493 w->mywidget.sizerequest = TRUE; | 495 w->mywidget.sizerequest = TRUE; |
| 496 | |
| 497 //XtWidgetGeometry request; | |
| 498 //request.width = req_width; | |
| 499 //request.request_mode = CWWidth; | |
| 500 //XtWidgetGeometry reply; | |
| 501 //XtGeometryResult result = XtMakeGeometryRequest((Widget)w, &request, &reply); | |
| 502 | |
| 494 XtMakeResizeRequest((Widget)w, req_width, req_height, &actual_width, &actual_height); | 503 XtMakeResizeRequest((Widget)w, req_width, req_height, &actual_width, &actual_height); |
| 495 w->mywidget.sizerequest = FALSE; | 504 w->mywidget.sizerequest = FALSE; |
| 496 //printf("size request: %d %d\n", (int)actual_width, (int)actual_height); | 505 //printf("size request: %d %d\n", (int)actual_width, (int)actual_height); |
| 497 } | 506 } |
| 498 | 507 |
