diff -r aba6a9deab8d -r 5a548d4c6724 ListView.st --- a/ListView.st Wed Jul 02 14:55:00 1997 +0200 +++ b/ListView.st Thu Jul 03 12:58:47 1997 +0200 @@ -1808,17 +1808,27 @@ font := font on:device. includesNonStrings == true ifTrue:[ - "/ for now, we do not support variable height entries ... - fontHeight := list first heightOn:self + |el| + + "/ for now, we do not support variable height entries ... + el := list first. + el isNil ifTrue:[ + list findFirst:[:e | e notNil ifTrue:[el := e. true] ifFalse:false]. + ]. + el isNil ifTrue:[ + fontHeight := font height. "/ maxHeight. + ] ifFalse:[ + fontHeight := el heightOn:self + ] ] ifFalse:[ - fontHeight := font height. "/ maxHeight. + fontHeight := font height. "/ maxHeight. ]. fontHeight := fontHeight + lineSpacing. fontAscent := font ascent. "/ maxAscent. fontWidth := font width. fontIsFixedWidth := font isFixedWidth. - "Modified: 22.5.1996 / 12:41:10 / cg" + "Modified: 3.7.1997 / 12:24:25 / cg" ! getListFromModel @@ -3669,5 +3679,5 @@ !ListView class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.136 1997-07-02 12:55:00 cg Exp $' + ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.137 1997-07-03 10:58:47 cg Exp $' ! !