MenuPanel: use menu panels' default font if item does not specify one explicitly. jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Fri, 31 Aug 2018 08:42:44 +0100
branchjv
changeset 5909 44772c9ba345
parent 5892 21a6e4d84614
child 5970 53fd42d2c814
MenuPanel: use menu panels' default font if item does not specify one explicitly.
MenuPanel.st
--- a/MenuPanel.st	Mon Jul 30 17:21:54 2018 +0100
+++ b/MenuPanel.st	Fri Aug 31 08:42:44 2018 +0100
@@ -6522,10 +6522,14 @@
     font := menuItem font.
 
     font notNil ifTrue:[
-	font := font onDevice:(menuPanel device).
-	menuItem font:font.
+        font := font onDevice:(menuPanel device).
+        menuItem font:font.
+    ] ifFalse:[ 
+        font := menuPanel font.
     ].
     ^ font
+
+    "Modified: / 31-08-2018 / 08:26:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 font:aFont