#REFACTORING by stefan
authorStefan Vogel <sv@exept.de>
Tue, 13 Sep 2016 12:09:39 +0200
changeset 7561 a9ba31e29ade
parent 7560 086e2f28082c
child 7562 217cc7ec5656
#REFACTORING by stefan class: FontDescription changed: #= #sameDeviceFontAs:
FontDescription.st
--- a/FontDescription.st	Mon Sep 12 15:02:39 2016 +0200
+++ b/FontDescription.st	Tue Sep 13 12:09:39 2016 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1994 by Claus Gittinger
 	      All Rights Reserved
@@ -9,8 +11,6 @@
  other person.  No title to or ownership of the software is
  hereby transferred.
 "
-'From Smalltalk/X, Version:7.1.0.0 on 20-07-2016 at 15:21:49'                   !
-
 "{ Package: 'stx:libview' }"
 
 "{ NameSpace: Smalltalk }"
@@ -930,15 +930,17 @@
     "two fonts are considered equal, if the font-name components are;
      independent of the device, the font is on"
 
-    (aFont species == self species) ifFalse:[^ false].
-    (size == aFont size) ifFalse:[^ false].  
-    (family = aFont family) ifFalse:[^ false].  
-    (face = aFont face) ifFalse:[^ false].  
-    (style = aFont style) ifFalse:[^ false].  
-    (encoding == aFont encoding) ifFalse:[^ false].  
-    (sizeUnit == aFont sizeUnit) ifFalse:[^ false].
+    (aFont species ~~ self species) ifTrue:[^ false].
+    (size ~~ aFont size) ifTrue:[^ false].  
+    (family ~= aFont family) ifTrue:[^ false].  
+    (face ~= aFont face) ifTrue:[^ false].  
+    (style ~= aFont style) ifTrue:[^ false].  
+    (encoding ~~ aFont encoding) ifTrue:[^ false].  
+    (sizeUnit ~~ aFont sizeUnit) ifTrue:[^ false].
     sizeUnit == #px ifTrue:[
-        (pixelSize == aFont pixelSize) ifFalse:[^ false].  
+        (pixelSize ~~ aFont pixelSize) ifTrue:[^ false].  
+    ] ifFalse:[
+        (size ~~ aFont size) ifTrue:[^ false].  
     ].
     ^ true
 
@@ -958,20 +960,20 @@
 !
 
 sameDeviceFontAs:aFont
-    aFont species == self species ifFalse:[^ false].
+    aFont species ~~ self species ifTrue:[^ false].
 
-    (family = aFont family) ifFalse:[ ^ false ].
-    (face = aFont face) ifFalse:[ ^ false ].
+    (family ~= aFont family) ifTrue:[ ^ false ].
+    (face ~= aFont face) ifTrue:[ ^ false ].
     ((style = aFont style) 
       or:[ (style = 'italic' and:[aFont style = 'oblique'])
       or:[ style = 'oblique' and:[aFont style = 'italic']]]) ifFalse:[ ^ false ].
 
     (encoding isNil or:[encoding = aFont encoding]) ifFalse:[ ^ false ].
-    (sizeUnit ? #pt) = aFont sizeUnit ifFalse:[ ^ false ].
+    (sizeUnit ? #pt) ~= aFont sizeUnit ifTrue:[ ^ false ].
     (sizeUnit ? #pt) == #pt ifTrue:[
-        (size = aFont size) ifFalse:[ ^ false ].
+        (size ~= aFont size) ifTrue:[ ^ false ].
     ] ifFalse:[
-        (pixelSize = aFont pixelSize) ifFalse:[ ^ false ].
+        (pixelSize ~= aFont pixelSize) ifTrue:[ ^ false ].
     ].
     ^ true
 ! !