From a87cf0300521a040b0f0251f7ddfc1f2cb14f0a5 Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Fri, 15 Jun 2007 19:09:50 +0000
Subject: [PATCH] fixed bug in new font preference handling

svn: r6667
---
 collects/drscheme/private/font.ss    | 16 +++++++++++-----
 collects/framework/private/editor.ss |  2 +-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/collects/drscheme/private/font.ss b/collects/drscheme/private/font.ss
index 8f1da9978e..a186827b18 100644
--- a/collects/drscheme/private/font.ss
+++ b/collects/drscheme/private/font.ss
@@ -105,14 +105,20 @@
                                             (preferences:set 
                                              'framework:standard-style-list:font-name 
                                              (list-ref all-faces (car choice)))))])))))]
-                          [font-name (preferences:get 'framework:standard-style-list:font-name)])
+                          [font-name (preferences:get 'framework:standard-style-list:font-name)]
+                          [set-choice-selection
+                           (λ (font-name)
+                             (cond
+                               [(send choice find-string font-name)
+                                (send choice set-string-selection font-name)]
+                               [else
+                                (send choice set-selection (- (send choice get-number) 1))]))])
+
                      (preferences:add-callback
                       'framework:standard-style-list:font-name
                       (λ (p v)
-                        (when (send choice find-string v)
-                          (send choice set-string-selection v))))
-                     (when (send choice find-string font-name)
-                       (send choice set-string-selection font-name))
+                        (set-choice-selection v)))
+                     (set-choice-selection font-name)
                      choice)]
                   [smoothing-contol
                    (new choice%
diff --git a/collects/framework/private/editor.ss b/collects/framework/private/editor.ss
index 3c47fb15bc..c8d1eb6393 100644
--- a/collects/framework/private/editor.ss
+++ b/collects/framework/private/editor.ss
@@ -372,7 +372,7 @@
         (preferences:add-callback 'framework:standard-style-list:font-name (λ (p v) (set-font-name v)))
         (preferences:add-callback 'framework:standard-style-list:smoothing (λ (p v) (set-font-smoothing v)))
         
-        (unless (member (preferences:get 'framework:standard-style-list:font-name) (get-face-list 'mono))
+        (unless (member (preferences:get 'framework:standard-style-list:font-name) (get-face-list))
           (preferences:set 'framework:standard-style-list:font-name (get-family-builtin-face 'modern))))
       
       ;; set-standard-style-list-delta : string (is-a?/c style-delta<%>) -> void