equal
deleted
inserted
replaced
1284 preferredExtent |
1284 preferredExtent |
1285 "return a good extent, one that makes subviews fit" |
1285 "return a good extent, one that makes subviews fit" |
1286 |
1286 |
1287 |sumOfWidths maxHeight maxWidth m2| |
1287 |sumOfWidths maxHeight maxWidth m2| |
1288 |
1288 |
|
1289 preferredExtent notNil ifTrue:[ |
|
1290 ^ preferredExtent |
|
1291 ]. |
|
1292 |
1289 subViews isNil ifTrue:[^ horizontalSpace @ verticalSpace]. |
1293 subViews isNil ifTrue:[^ horizontalSpace @ verticalSpace]. |
1290 |
1294 |
1291 "compute net height needed" |
1295 "compute net height needed" |
1292 |
1296 |
1293 sumOfWidths := 0. |
1297 sumOfWidths := 0. |
1340 ]. |
1344 ]. |
1341 |
1345 |
1342 m2 := margin * 2. |
1346 m2 := margin * 2. |
1343 ^ (sumOfWidths + m2) @ (maxHeight + m2) |
1347 ^ (sumOfWidths + m2) @ (maxHeight + m2) |
1344 |
1348 |
1345 "Modified: 22.2.1996 / 20:46:28 / cg" |
1349 "Modified: 29.5.1996 / 12:12:31 / cg" |
1346 ! ! |
1350 ! ! |
1347 |
1351 |
1348 !HorizontalPanelView class methodsFor:'documentation'! |
1352 !HorizontalPanelView class methodsFor:'documentation'! |
1349 |
1353 |
1350 version |
1354 version |
1351 ^ '$Header: /cvs/stx/stx/libwidg/HorizontalPanelView.st,v 1.23 1996-04-27 18:19:40 cg Exp $' |
1355 ^ '$Header: /cvs/stx/stx/libwidg/HorizontalPanelView.st,v 1.24 1996-05-29 10:17:27 cg Exp $' |
1352 ! ! |
1356 ! ! |