- Timestamp:
- 2023-06-13T18:29:55+02:00 (14 months ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r18598 r18751 842 842 PlatformManager.getPlatform().afterPrefStartupHook(); 843 843 844 applyWorkarounds();845 846 844 FontsManager.initialize(); 847 845 … … 914 912 // Configure Look and feel before showing SplashScreen (#19290) 915 913 setupUIManager(); 914 // Then apply LaF workarounds 915 applyLaFWorkarounds(); 916 916 // MainFrame created before setting look and feel and not updated (#20771) 917 917 SwingUtilities.updateComponentTreeUI(mainFrame); … … 1063 1063 } 1064 1064 1065 static void applyWorkarounds() { 1065 /** 1066 * Apply workarounds for LaF and platform specific issues. This must be called <i>after</i> the 1067 * LaF is set. 1068 */ 1069 static void applyLaFWorkarounds() { 1066 1070 final String laf = UIManager.getLookAndFeel().getID(); 1067 1071 final int javaVersion = Utils.getJavaVersion(); … … 1101 1105 if ("Metal".equals(laf) && javaVersion >= 11 && javaVersion < 17) { 1102 1106 UIManager.put("ToolTipUI", JosmMetalToolTipUI.class.getCanonicalName()); 1107 } 1108 1109 // See #20850. The upstream bug (JDK-6396936) is unlikely to ever be fixed due to potential compatibility 1110 // issues. This affects Windows LaF only (includes Windows Classic, a sub-LaF of Windows LaF). 1111 if ("Windows".equals(laf) && "Monospaced".equals(UIManager.getFont("TextArea.font").getFamily())) { 1112 UIManager.put("TextArea.font", UIManager.getFont("TextField.font")); 1103 1113 } 1104 1114 }
Note:
See TracChangeset
for help on using the changeset viewer.