care for label being neither image, nor string
authorca
Mon, 26 Jan 1998 19:54:50 +0100
changeset 1428 a4b075871259
parent 1427 f73bcbd3b994
child 1429 b7b7f3477594
care for label being neither image, nor string (i.e. ListEtry) for correct centering.
Label.st
--- a/Label.st	Sun Jan 25 15:13:44 1998 +0100
+++ b/Label.st	Mon Jan 26 19:54:50 1998 +0100
@@ -1514,9 +1514,8 @@
     self computeLabelSize.
     fixSize ifFalse:[
         self resize
-    ] ifTrue:[
-        self computeLabelOrigin
     ].
+    self computeLabelOrigin.
     shown ifTrue:[
         self invalidate
     ]
@@ -1628,8 +1627,9 @@
             x := x + hSpace.
             y := y + vSpace.
 
-            (logo isString 
-            or:[logo isKindOf:StringCollection]) ifTrue:[
+            (logo isString
+            or:[logo species == String
+            or:[logo isKindOf:StringCollection]]) ifTrue:[
                 stringLogo := true.
                 y := y + (font ascent).
             ] ifFalse:[
@@ -1726,5 +1726,5 @@
 !Label class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Label.st,v 1.87 1998-01-15 00:06:41 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Label.st,v 1.88 1998-01-26 18:54:50 ca Exp $'
 ! !