Mercurial Mercurial > hg > stx-libwidg / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ListView.st
changeset 4570 1cce72ca7d18
parent 4536 c9d840b654b4
child 4573 f181a93c3bc2 
--- a/ListView.st	Fri Apr 26 11:46:46 2013 +0200
+++ b/ListView.st	Fri Apr 26 11:46:57 2013 +0200
@@ -2559,24 +2559,26 @@
     hMax := font height.
 
     includesNonStrings == true ifTrue:[
-	"/
-	"/ find maximum height of lines
-	"/
-	hMax := list inject:hMax into:[:maxSoFar :thisLine |
-					thisLine isNil ifTrue:[
-					    maxSoFar
-					] ifFalse:[
-					    (thisLine isMemberOf:String) ifTrue:[
-						maxSoFar
-					    ] ifFalse:[
-						maxSoFar max:(thisLine heightOn:self)
-					    ]
-					]
-			      ].
+        "/
+        "/ find maximum height of lines
+        "/
+        hMax := list inject:hMax into:[:maxSoFar :thisLine |
+                                        thisLine isNil ifTrue:[
+                                            maxSoFar
+                                        ] ifFalse:[
+                                            (thisLine isMemberOf:String) ifTrue:[
+                                                maxSoFar
+                                            ] ifFalse:[
+                                                maxSoFar max:(thisLine heightOn:self)
+                                            ]
+                                        ]
+                              ].
 
     ].
-    fontHeight := hMax + lineSpacing.
-    fontAscent := font ascent. "/ maxAscent. -- see SelectionInListViews selection in motif style
+    fontHeight := (hMax + lineSpacing) max: font maxHeight.
+    "/ fontAscent := font ascent. "/ maxAscent. -- see SelectionInListViews selection in motif style
+    fontAscent := font maxAscent "ascent". "/ maxAscent. -- see SelectionInListViews selection in motif style
+    fontAscent := (font maxAscent + font ascent) // 2. "/ maxAscent. -- see SelectionInListViews selection in motif style
     fontWidth := font width.
     fontIsFixedWidth := font isFixedWidth.
 
@@ -4859,10 +4861,10 @@
 !ListView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.360 2013-03-20 10:35:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.361 2013-04-26 09:46:57 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.360 2013-03-20 10:35:25 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/ListView.st,v 1.361 2013-04-26 09:46:57 cg Exp $'
 ! !
hg/stx-libwidg