# HG changeset patch
# User wenzelm
# Date 1610219876 -3600
# Node ID 6a6e987552c7260d4747d745b5d3dbd522ec8cc2
# Parent  b84887a67cc64219347f8248e714287f08b85d26
clarified list of presented look-and-feels;
clarified signature;

diff -r b84887a67cc6 -r 6a6e987552c7 src/Pure/GUI/gui.scala
--- a/src/Pure/GUI/gui.scala	Sat Jan 09 19:49:22 2021 +0100
+++ b/src/Pure/GUI/gui.scala	Sat Jan 09 20:17:56 2021 +0100
@@ -7,7 +7,7 @@
 package isabelle
 
 import java.awt.{Component, Container, Font, Image, Insets, KeyboardFocusManager, Window, Point,
-  Rectangle, Dimension, GraphicsEnvironment, MouseInfo, Toolkit, Taskbar}
+  Rectangle, Dimension, GraphicsEnvironment, MouseInfo, Toolkit}
 import java.awt.font.{FontRenderContext, LineMetrics, TextAttribute, TransformAttribute}
 import java.awt.geom.AffineTransform
 import javax.swing.{ImageIcon, JButton, JDialog, JFrame, JLabel, JLayeredPane, JOptionPane,
@@ -27,15 +27,27 @@
   def is_macos_laf(): Boolean =
     Platform.is_macos && UIManager.getSystemLookAndFeelClassName() == current_laf()
 
-  class Look_And_Feel(val laf: LookAndFeel) extends Isabelle_System.Service
+  class Look_And_Feel(laf: LookAndFeel) extends Isabelle_System.Service
   {
-    def setup: Unit = UIManager.installLookAndFeel(laf.getName, laf.getClass.getName)
+    def info: UIManager.LookAndFeelInfo =
+      new UIManager.LookAndFeelInfo(laf.getName, laf.getClass.getName)
   }
 
   lazy val look_and_feels: List[Look_And_Feel] =
     Isabelle_System.make_services(classOf[Look_And_Feel])
 
-  def setup_lafs(): Unit = look_and_feels.foreach(_.setup)
+  def init_lafs()
+  {
+    val old_lafs =
+      Set(
+        "com.sun.java.swing.plaf.motif.MotifLookAndFeel",
+        "com.sun.java.swing.plaf.windows.WindowsClassicLookAndFeel")
+    val lafs =
+      UIManager.getInstalledLookAndFeels().toList
+        .filterNot(info => old_lafs(info.getClassName))
+    val more_lafs = look_and_feels.map(_.info)
+    UIManager.setInstalledLookAndFeels((more_lafs ::: lafs).toArray)
+  }
 
 
   /* additional look-and-feels */
diff -r b84887a67cc6 -r 6a6e987552c7 src/Pure/Tools/main.scala
--- a/src/Pure/Tools/main.scala	Sat Jan 09 19:49:22 2021 +0100
+++ b/src/Pure/Tools/main.scala	Sat Jan 09 20:17:56 2021 +0100
@@ -26,7 +26,7 @@
           Isabelle_System.init()
           Isabelle_Fonts.init()
 
-          GUI.setup_lafs()
+          GUI.init_lafs()
 
 
           /* ROOTS template */