stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8230869: [macos 10.15] The String "X Y Z" was not set to application's icon in the taskbar

Browse Source 
Reviewed-by: jdv, psadhukhan
This commit is contained in:
Sergey Bylokhov 2019-10-17 14:07:02 -07:00
parent 8ca21069c6
commit 0fcb58c5d5
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/java.desktop/macosx/classes/apple/laf/JRSUIUtils.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -36,6 +36,11 @@ public final class JRSUIUtils {
static boolean isLeopard = isMacOSXLeopard();
static boolean isSnowLeopardOrBelow = isMacOSXSnowLeopardOrBelow();
static boolean isCatalinaOrAbove = isMacOSXCatalinaOrAbove();
static boolean isMacOSXCatalinaOrAbove() {
return currentMacOSXVersionMatchesGivenVersionRange(15, true, false, true);
}
static boolean isMacOSXLeopard() {
return isCurrentMacOSXVersion(5);
@ -74,6 +79,12 @@ public final class JRSUIUtils {
return false;
}
public static class TaskBar {
public static boolean isIconBadgeSupported() {
return !isCatalinaOrAbove;
}
}
public static class TabbedPane {
public static boolean useLegacyTabs() {
return isLeopard;

7
src/java.desktop/macosx/classes/sun/lwawt/macosx/CTaskbarPeer.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -25,12 +25,14 @@
package sun.lwawt.macosx;
import com.apple.eawt.Application;
import java.awt.Image;
import java.awt.PopupMenu;
import java.awt.Taskbar.Feature;
import java.awt.peer.TaskbarPeer;
import apple.laf.JRSUIUtils;
import com.apple.eawt.Application;
final public class CTaskbarPeer implements TaskbarPeer {
CTaskbarPeer() {}
@ -40,6 +42,7 @@ final public class CTaskbarPeer implements TaskbarPeer {
switch(feature) {
case ICON_BADGE_TEXT:
case ICON_BADGE_NUMBER:
return JRSUIUtils.TaskBar.isIconBadgeSupported();
case ICON_IMAGE:
case MENU:
case PROGRESS_VALUE: