Merge jv
authorMerge Script
Mon, 12 Oct 2015 07:06:31 +0200
branchjv
changeset 18819 767041415d71
parent 18817 080a64087e21 (current diff)
parent 18818 2e6061696ce1 (diff)
child 18822 ed3353058909
Merge
UserPreferences.st
--- a/UserPreferences.st	Fri Oct 09 06:49:31 2015 +0200
+++ b/UserPreferences.st	Mon Oct 12 07:06:31 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 1998 by eXept Software AG
 	      All Rights Reserved
@@ -1888,17 +1890,25 @@
 fontPreferences:aDictionary
     "experimental"
 
-    |fn getFont|
+    self at:#fontPreferences put:aDictionary.
+    aDictionary isNil ifTrue:[^ self].
+
+    self fontPreferencesChanged.
+!
+
+fontPreferencesChanged
+    "tells view classes about changed font preferences"
+
+    |dict fn getFont|
     
-    self at:#fontPreferences put:aDictionary.
-
-    aDictionary isNil ifTrue:[^ self].
+    dict := self at:#fontPreferences.
+    dict isNil ifTrue:[^ self].
 
     getFont := 
         [:key|
             |s fn|
             
-            s := aDictionary at:key ifAbsent:nil.
+            s := dict at:key ifAbsent:nil.
             s notNil ifTrue:[
                 fn := Object readFrom:s.
                 self useXftFontsOnly ifTrue:[