#UI_ENHANCEMENT by stefan
authorStefan Vogel <sv@exept.de>
Fri, 29 Dec 2017 12:05:56 +0100
changeset 6246 16356c6f37c0
parent 6245 749e8e120788
child 6247 5fca462d73a9
#UI_ENHANCEMENT by stefan class: FontPanel changed: #fontForPreview prefer unicode encoding for shown font
FontPanel.st
--- a/FontPanel.st	Fri Dec 22 16:39:51 2017 +0100
+++ b/FontPanel.st	Fri Dec 29 12:05:56 2017 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1991 by Claus Gittinger
 	      All Rights Reserved
@@ -164,7 +162,7 @@
 defaultLatin1SampleString
     "return the sample latin1 preview text"
 
-    ^ (self defaultAsciiSampleString) , 'äöüÄÖÜßéèêå©'
+    ^ (self defaultAsciiSampleString) , 'äöüÄÖÜßéèêå©'
 !
 
 defaultSampleStringForEncoding:enc
@@ -208,8 +206,8 @@
     |t|
 
     t := (self defaultAsciiSampleString) , '
-diaresis: äöüÄÖÜß
-accent: éèêåÅ
+diaresis: äöüÄÖÜß
+accent: éèêåÅ
 special: ' ,  #(16r20AC) asUnicodeString , '
 math: ' ,  #(16r2200 16r2203 16r221E 16r2208 16r2209) asUnicodeString , '
 cyrillic: ' ,  #(16r440 16r443 16r441 16r441 16r43A 16r438 16r439 16r20 16r44F 16r437 16r44B 16r43A) asUnicodeString , '
@@ -1069,12 +1067,8 @@
     fonts isEmpty ifTrue:[
         ^ nil
     ].
+    fontShown := fonts detect:[:eachFont| eachFont encoding = #'iso10646-1'] ifNone:[fonts first].
 
-    fonts size > 1 ifTrue:[
-        'FontPanel [info]: huh - multiple entries: ' infoPrint. fonts infoPrintCR.
-        "/ self halt.
-    ].
-    fontShown := fonts first.
     fontShown isScaledFont ifTrue:[
         szUnitUsed == #px ifTrue:[
             fontShown := fontShown asPixelSize:sz
@@ -1126,6 +1120,8 @@
 "/        ]    
 "/    ].
 "/    ^ fontShown
+
+    "Modified: / 29-12-2017 / 12:04:12 / stefan"
 !
 
 getFacesForFamily:aFamilyName filtering:filter