Changeset 17487 in josm for trunk/src/org
- Timestamp:
- 2021-02-08T20:52:53+01:00 (3 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/MainApplication.java
r17399 r17487 7 7 8 8 import java.awt.AWTError; 9 import java.awt.Color; 9 10 import java.awt.Container; 10 11 import java.awt.Dimension; … … 1042 1043 Logging.log(Logging.LEVEL_ERROR, null, e); 1043 1044 } 1045 } 1046 // Workaround for JDK-8251377: JTabPanel active tab is unreadable in Big Sur, see #20075 1047 // os.version will return 10.16, or 11.0 depending on environment variable 1048 // https://twitter.com/BriceDutheil/status/1330926649269956612 1049 else { 1050 final String laf = UIManager.getLookAndFeel().getID(); 1051 final String macOSVersion = getSystemProperty("os.version"); 1052 if(PlatformManager.isPlatformOsx() && (laf.contains("Mac") || laf.contains("Aqua")) && (macOSVersion.startsWith("10.16") || macOSVersion.startsWith("11"))){ 1053 UIManager.put("TabbedPane.foreground", Color.BLACK); 1054 } 1044 1055 } 1045 1056 } -
trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
r15121 r17487 26 26 import java.util.List; 27 27 import java.util.Objects; 28 import java.util.Optional; 28 29 import java.util.concurrent.ExecutionException; 29 30 … … 31 32 import org.openstreetmap.josm.gui.MainApplication; 32 33 import org.openstreetmap.josm.io.CertificateAmendment.NativeCertAmend; 34 import org.openstreetmap.josm.spi.preferences.Config; 35 33 36 34 37 /** … … 81 84 } 82 85 // setup the dock icon. It is automatically set with application bundle and Web start but we need 83 // to do it manually if run with `java -jar`` 84 eawtApplication.getDeclaredMethod("setDockIconImage", Image.class).invoke(appli, ImageProvider.get("logo").getImage()); 86 // to do it manually if run with `java -jar``. 87 eawtApplication.getDeclaredMethod("setDockIconImage", Image.class).invoke( 88 appli, 89 Optional.ofNullable( 90 new ImageProvider(Config.getUrls().getJOSMWebsite()+"/logo-macos.png").setOptional(true).get() 91 ).orElse( // Fall back to default icon 92 ImageProvider.get("logo")).getImage() 93 ); 94 85 95 // enable full screen 86 96 enableOSXFullscreen(MainApplication.getMainFrame());
Note:
See TracChangeset
for help on using the changeset viewer.