This is an automated email from the ASF dual-hosted git repository.
ebakke pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 1dccf14fad Do not set the MainWindow's icon images on macOS.
1dccf14fad is described below
commit 1dccf14fadb874e95b8e8ae3517a804a23cb3e82
Author: Christian Oyarzun <[email protected]>
AuthorDate: Mon Mar 4 10:52:51 2024 -0500
Do not set the MainWindow's icon images on macOS.
This allows macOS to use the icns to create a minimized icon for the Dock
---
.../src/org/netbeans/core/windows/view/ui/MainWindow.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java
b/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java
index 32e877efb1..c60129c73b 100755
---
a/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java
+++
b/platform/core.windows/src/org/netbeans/core/windows/view/ui/MainWindow.java
@@ -511,8 +511,8 @@ public final class MainWindow {
private static final String ICON_1024 =
"org/netbeans/core/startup/frame1024.png"; // NOI18N
static void initFrameIcons(Frame f) {
List<Image> currentIcons = f.getIconImages();
- if( !currentIcons.isEmpty() )
- return; //do not override icons if they have been already provided
elsewhere (JDev)
+ if( !currentIcons.isEmpty() || Utilities.isMac())
+ return; //do not override icons if they have been already provided
elsewhere (JDev / macOS uses Dock icon)
f.setIconImages(Arrays.asList(
ImageUtilities.loadImage(ICON_16, true),
ImageUtilities.loadImage(ICON_32, true),
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
