Button.st
changeset 705 e2e7e718eb93
parent 655 acad3ef3a46c
child 707 9e5ed6312943
--- a/Button.st	Tue May 28 20:32:54 1996 +0200
+++ b/Button.st	Tue May 28 21:00:16 1996 +0200
@@ -1548,9 +1548,9 @@
     offLevel := DefaultPassiveLevel.
 
     DefaultDisabledForegroundColor notNil ifTrue:[
-	disabledFgColor := DefaultDisabledForegroundColor on:device
+        disabledFgColor := DefaultDisabledForegroundColor on:device
     ] ifFalse:[
-	disabledFgColor := fgColor
+        disabledFgColor := fgColor
     ].
 
     DefaultEnteredForegroundColor notNil ifTrue:[enteredFgColor := DefaultEnteredForegroundColor on:device].
@@ -1562,25 +1562,25 @@
     DefaultLightColor notNil ifTrue:[lightColor := DefaultLightColor on:device].
 
     shadowColor isNil ifTrue:[
-	shadowColor := Black.
+        shadowColor := Black.
     ].
     lightColor isNil ifTrue:[
-	lightColor := White.
+        lightColor := White.
     ].
 
     hasGreyscales := device hasGreyscales.
     (edgeStyle == #soft) ifTrue:[
-	DefaultHalfShadowColor notNil ifTrue:[halfShadowColor := DefaultHalfShadowColor on:device].
-	DefaultHalfLightColor notNil ifTrue:[halfLightColor := DefaultHalfLightColor on:device].
+        DefaultHalfShadowColor notNil ifTrue:[halfShadowColor := DefaultHalfShadowColor on:device].
+        DefaultHalfLightColor notNil ifTrue:[halfLightColor := DefaultHalfLightColor on:device].
 
-	halfShadowColor isNil ifTrue:[
+        halfShadowColor isNil ifTrue:[
 "/            hasGreyscales ifTrue:[
 "/                halfShadowColor := Color darkGrey
 "/            ] ifFalse:[
 "/                halfShadowColor := shadowColor
 "/            ]
-	    halfShadowColor := shadowColor lightened
-	]
+            halfShadowColor := shadowColor lightened
+        ]
     ].
 
     "
@@ -1589,73 +1589,75 @@
     "
     nm := styleSheet name.
     (nm == #iris) ifTrue:[
-	hasGreyscales ifTrue:[
-	    DefaultEnteredBackgroundColor isNil ifTrue:[
-		enteredBgColor := bgColor lightened "Color lightGrey".
-	    ].
-	    DefaultActiveBackgroundColor isNil ifTrue:[
-		activeBgColor := enteredBgColor.
-	    ].
-	    DefaultActiveForegroundColor isNil ifTrue:[
-		activeFgColor := enteredFgColor.
-	    ].
-	] ifFalse:[
-	    DefaultEnteredBackgroundColor isNil ifTrue:[
-		enteredBgColor := Color veryLightGrey.
-	    ].
-	    DefaultActiveBackgroundColor isNil ifTrue:[
-		activeBgColor := Black.
-	    ].
-	    DefaultActiveForegroundColor isNil ifTrue:[
-		activeFgColor := White.
-	    ].
-	].
+        hasGreyscales ifTrue:[
+            DefaultEnteredBackgroundColor isNil ifTrue:[
+                enteredBgColor := bgColor lightened "Color lightGray".
+            ].
+            DefaultActiveBackgroundColor isNil ifTrue:[
+                activeBgColor := enteredBgColor.
+            ].
+            DefaultActiveForegroundColor isNil ifTrue:[
+                activeFgColor := enteredFgColor.
+            ].
+        ] ifFalse:[
+            DefaultEnteredBackgroundColor isNil ifTrue:[
+                enteredBgColor := Color veryLightGray.
+            ].
+            DefaultActiveBackgroundColor isNil ifTrue:[
+                activeBgColor := Black.
+            ].
+            DefaultActiveForegroundColor isNil ifTrue:[
+                activeFgColor := White.
+            ].
+        ].
     ] ifFalse:[
-	nm == #motif ifTrue:[
-	    lightColor isNil ifTrue:[
-		lightColor := bgColor lightened
-	    ].
+        nm == #motif ifTrue:[
+            lightColor isNil ifTrue:[
+                lightColor := bgColor lightened
+            ].
 "/            hasGreyscales ifTrue:[
 "/                lightColor := Color lightGrey
 "/            ]
-	] ifFalse:[
-	    nm == #st80 ifTrue:[
-		hasGreyscales ifTrue:[
-		    DefaultActiveForegroundColor isNil ifTrue:[
-			activeFgColor := fgColor.
-		    ].
-		    DefaultActiveBackgroundColor isNil ifTrue:[
-			activeBgColor := bgColor darkened.
-		    ].
-		] ifFalse:[
-		    DefaultActiveForegroundColor isNil ifTrue:[
-			activeFgColor := White.
-		    ].
-		    DefaultActiveBackgroundColor isNil ifTrue:[
-			activeBgColor := Black
-		    ]
-		]
-	    ]
-	]
+        ] ifFalse:[
+            nm == #st80 ifTrue:[
+                hasGreyscales ifTrue:[
+                    DefaultActiveForegroundColor isNil ifTrue:[
+                        activeFgColor := fgColor.
+                    ].
+                    DefaultActiveBackgroundColor isNil ifTrue:[
+                        activeBgColor := bgColor darkened.
+                    ].
+                ] ifFalse:[
+                    DefaultActiveForegroundColor isNil ifTrue:[
+                        activeFgColor := White.
+                    ].
+                    DefaultActiveBackgroundColor isNil ifTrue:[
+                        activeBgColor := Black
+                    ]
+                ]
+            ]
+        ]
     ].
 
     offLevel ~~ level ifTrue:[
-	self level:offLevel.
-	margin := (onLevel abs) max:(offLevel abs).
+        self level:offLevel.
+        margin := (onLevel abs) max:(offLevel abs).
     ].
 
     DefaultReturnButtonHasImage ifTrue:[
-	(styleSheet is3D and:[hasGreyscales]) ifTrue:[
-	    shadowForm := self class returnShadowFormOn:device.
-	    lightForm := self class returnLightFormOn:device.
-	    formColor := viewBackground.
-	    formShadowColor := shadowColor.
-	    formLightColor := lightColor
-	] ifFalse:[
-	    shadowForm := self class returnFormOn:device.
-	    formColor := Black
-	].
+        (styleSheet is3D and:[hasGreyscales]) ifTrue:[
+            shadowForm := self class returnShadowFormOn:device.
+            lightForm := self class returnLightFormOn:device.
+            formColor := viewBackground.
+            formShadowColor := shadowColor.
+            formLightColor := lightColor
+        ] ifFalse:[
+            shadowForm := self class returnFormOn:device.
+            formColor := Black
+        ].
     ].
+
+    "Modified: 28.5.1996 / 20:52:29 / cg"
 !
 
 initialize
@@ -1984,5 +1986,5 @@
 !Button class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.58 1996-05-18 15:38:12 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg/Button.st,v 1.59 1996-05-28 19:00:16 cg Exp $'
 ! !