WinWorkstation.st
changeset 5941 23092a09b2b6
parent 5940 c7f52860ba82
child 5943 55021742c5fd
--- a/WinWorkstation.st	Thu Oct 25 15:08:24 2012 +0200
+++ b/WinWorkstation.st	Thu Oct 25 15:31:56 2012 +0200
@@ -5199,7 +5199,6 @@
 
 initialize
     "/ super initialize.
-
     self initializeStandardColorNames.
 
     NativeWidgets := NativeDialogs := NativeFileDialogs := false.
@@ -7420,8 +7419,8 @@
 
     minH := self usableHeight.
     self monitorHandles do:[:eachHandle |
-        info := self monitorInfoFor:eachHandle.
-        info notNil ifTrue:[ minH := minH min: info workHeight ].
+	info := self monitorInfoFor:eachHandle.
+	info notNil ifTrue:[ minH := minH min: info workHeight ].
     ].
     ^ minH
 
@@ -12835,8 +12834,8 @@
 !
 
 getFontWithFamily:familyString face:faceString
-            style:styleArgString size:sizeArg sizeUnit:sizeUnitArg
-            encoding:encoding
+	    style:styleArgString size:sizeArg sizeUnit:sizeUnitArg
+	    encoding:encoding
 
     "try to get the specified font, if not available, try the next smaller
      font."
@@ -12845,71 +12844,71 @@
 
     styleString := styleArgString.
     encoding isEmptyOrNil ifTrue:[
-        encodingSym := #'ms-default' "/ encoding.
+	encodingSym := #'ms-default' "/ encoding.
     ] ifFalse:[
-        encodingSym := encoding asLowercase asSymbol.
+	encodingSym := encoding asLowercase asSymbol.
     ].
 
     "special: if face is nil, allow access to X-fonts"
     faceString isNil ifTrue:[
-        sizeArg notNil ifTrue:[
-            theName := familyString , '-' , sizeArg printString
-        ] ifFalse:[
-            theName := familyString
-        ].
-        theName notNil ifTrue:[
-            theId := self createFontFor:theName.
-        ].
-        theId isNil ifTrue:[
-            theId := self getDefaultFontWithEncoding:encoding
-        ].
-        ^ theId
+	sizeArg notNil ifTrue:[
+	    theName := familyString , '-' , sizeArg printString
+	] ifFalse:[
+	    theName := familyString
+	].
+	theName notNil ifTrue:[
+	    theId := self createFontFor:theName.
+	].
+	theId isNil ifTrue:[
+	    theId := self getDefaultFontWithEncoding:encoding
+	].
+	^ theId
     ].
 
     "/ spacing other than 'normal' is contained as last component
     "/ in style
     styleString notNil ifTrue:[
-        ((styleString endsWith:'-narrow')
-         or:[styleString endsWith:'-semicondensed']) ifTrue:[
-            |i|
-            i := styleString lastIndexOf:$-.
-            spacing := styleString copyFrom:(i+1).
-            styleString := styleString copyTo:(i-1).
-        ] ifFalse:[
-            spacing := #normal.
-        ].
+	((styleString endsWith:'-narrow')
+	 or:[styleString endsWith:'-semicondensed']) ifTrue:[
+	    |i|
+	    i := styleString lastIndexOf:$-.
+	    spacing := styleString copyFrom:(i+1).
+	    styleString := styleString copyTo:(i-1).
+	] ifFalse:[
+	    spacing := #normal.
+	].
     ].
 
     xlatedStyle := styleString.
     xlatedStyle notNil ifTrue:[
-        xlatedStyle := xlatedStyle first asString
+	xlatedStyle := xlatedStyle first asString
     ].
 
     pxSize := sizeUnitArg == #px ifTrue:[sizeArg] ifFalse:[nil].
     ptSize := sizeUnitArg == #pt ifTrue:[sizeArg] ifFalse:[nil].
 
     id := self
-            getFontWithFoundry:#*
-            family:familyString asLowercase
-            weight:faceString
-            slant:styleString "/ xlatedStyle
-            spacing:spacing
-            pixelSize:pxSize
-            size:ptSize
-            registry:#*
-            encoding:encodingSym.
+	    getFontWithFoundry:#*
+	    family:familyString asLowercase
+	    weight:faceString
+	    slant:styleString "/ xlatedStyle
+	    spacing:spacing
+	    pixelSize:pxSize
+	    size:ptSize
+	    registry:#*
+	    encoding:encodingSym.
 
     id isNil ifTrue:[
-        id := self
-                getFontWithFoundry:#*
-                family:familyString asLowercase
-                weight:faceString asLowercase
-                slant:styleString asLowercase
-                spacing:spacing
-                pixelSize:pxSize
-                size:ptSize
-                registry:#*
-                encoding:encodingSym.
+	id := self
+		getFontWithFoundry:#*
+		family:familyString asLowercase
+		weight:faceString asLowercase
+		slant:styleString asLowercase
+		spacing:spacing
+		pixelSize:pxSize
+		size:ptSize
+		registry:#*
+		encoding:encodingSym.
     ].
     ^ id
 
@@ -19064,11 +19063,11 @@
 !WinWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.462 2012-10-25 13:08:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.463 2012-10-25 13:31:56 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.462 2012-10-25 13:08:24 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/WinWorkstation.st,v 1.463 2012-10-25 13:31:56 cg Exp $'
 ! !
 
 WinWorkstation initialize!