Mercurial Mercurial > hg > stx-libview / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not return font infos as sorted collections
authorStefan Vogel <sv@exept.de>
Thu, 19 Apr 2001 16:21:02 +0200
changeset 3419 04d77587de17
parent 3418 33b8326559a7
child 3420 806489462764
Do not return font infos as sorted collections (this is a representation issue!)
DeviceWorkstation.st file | annotate | diff | comparison | revisions 
--- a/DeviceWorkstation.st	Thu Apr 19 15:50:19 2001 +0200
+++ b/DeviceWorkstation.st	Thu Apr 19 16:21:02 2001 +0200
@@ -2942,13 +2942,10 @@
     ^ #('red' 'green' 'blue' 'yellow' 'magenta' 'cyan' 'white' 'black')
 !
 
-numFixBlue
-    "return the number of blue shades in the
-     preallocated fix color cube (or 0 if there is none)"
-
-    ^ numFixBlue
-
-    "Created: 11.7.1996 / 17:49:58 / cg"
+releaseFont:aFontId
+    "free a font"
+
+    ^ self subclassResponsibility
 !
 
 numFixGreen
@@ -4530,10 +4527,11 @@
 
     |fonts|
 
-    fonts := self fontsInFamily:aFamilyName filtering:filterBlock.
+    fonts := self fontsInFamily:aFamilyName 
+                  filtering:[:f| f face notNil and:[filterBlock isNil or:[filterBlock value:f]]].
     fonts size == 0 ifTrue:[^ nil].
 
-    ^ (fonts collect:[:descr | descr face]) asSortedCollection
+    ^ fonts collect:[:descr | descr face]
 
     "
      Display facesInFamily:'fixed' filtering:[:f |
@@ -4575,7 +4573,7 @@
     fonts := self fontsFiltering:aFilterBlock.
     fonts size == 0 ifTrue:[^ nil].
 
-    ^ (fonts collect:[:descr | descr family]) asSortedCollection
+    ^ fonts collect:[:descr | descr family]
 
     "
      Display fontFamiliesFiltering:[:f | 
@@ -4795,14 +4793,15 @@
     "Modified: 27.2.1996 / 01:38:42 / cg"
 !
 
-sizesInFamily:aFamilyName face:aFaceName style:aStyleName filtering:filter
+sizesInFamily:aFamilyName face:aFaceName style:aStyleName filtering:filterBlock
     "return a set of all available font sizes in aFamily/aFace/aStyle
      on this display.
-     But only those matching filter (if nonNIl)."
+     But only those matching filterBlock (if notNil)."
 
     |fonts|
 
-    fonts := self fontsInFamily:aFamilyName face:aFaceName style:aStyleName filtering:filter.
+    fonts := self fontsInFamily:aFamilyName face:aFaceName style:aStyleName 
+                  filtering:[:f| f size notNil and:[filterBlock isNil or:[filterBlock value:f]]].
     fonts size == 0 ifTrue:[^ nil].
 
     ^ fonts collect:[:descr | descr size].
@@ -4829,16 +4828,17 @@
     "Modified: 27.2.1996 / 01:35:43 / cg"
 !
 
-stylesInFamily:aFamilyName face:aFaceName filtering:filter
+stylesInFamily:aFamilyName face:aFaceName filtering:filterBlock
     "return a set of all available font styles in aFamily/aFace on this display.
-     But only thise matching filter (if nonNil)."
+     But only thise matching filterBlock (if notNil)."
 
     |fonts|
 
-    fonts := self fontsInFamily:aFamilyName face:aFaceName filtering:filter.
+    fonts := self fontsInFamily:aFamilyName face:aFaceName
+                  filtering:[:f| f style notNil and:[filterBlock isNil or:[filterBlock value:f]]].
     fonts size == 0 ifTrue:[^ nil].
 
-    ^ (fonts collect:[:descr | descr style]) asSortedCollection
+    ^ fonts collect:[:descr | descr style]
 
     "
      Display stylesInFamily:'fixed' face:'medium' filtering:[:f |
@@ -7249,6 +7249,6 @@
 !DeviceWorkstation class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.394 2001-04-13 16:20:22 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.395 2001-04-19 14:21:02 stefan Exp $'
 ! !
 DeviceWorkstation initialize!
hg/stx-libview