Skip to content

[macOS] Only use Decorations#setImage() in Dock if no app bundle set #2628

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[macOS] Only use Decorations#setImage() in Dock if no app bundle set #2628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Decorations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ public void setImage (Image image) {
if (image != null && image.isDisposed()) error(SWT.ERROR_INVALID_ARGUMENT);
this.image = image;
if (parent != null) return;
if (display.dockImage == null) {
if (display.dockImage == null && !display.isBundledIconSet()) {
display.application.setApplicationIconImage (image != null ? image.handle : null);
}
}
Expand Down Expand Up @@ -552,7 +552,7 @@ public void setImages (Image [] images) {
}
this.images = images;
if (parent != null) return;
if (display.dockImage == null) {
if (display.dockImage == null && !display.isBundledIconSet()) {
if (images != null && images.length > 1) {
Image [] bestImages = new Image [images.length];
System.arraycopy (images, 0, bestImages, 0, images.length);
Expand Down
11 changes: 11 additions & 0 deletions bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/Display.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3441,6 +3441,17 @@ boolean isBundled () {
return false;
}

boolean isBundledIconSet () {
NSBundle mainBundle = NSBundle.mainBundle();
if (mainBundle != null) {
NSDictionary info = mainBundle.infoDictionary();
if (info != null) {
return info.objectForKey(NSString.stringWith("CFBundleIconName")) != null || info.objectForKey(NSString.stringWith("CFBundleIconFile")) != null ;
}
}
return false;
}

static boolean isValidClass (Class<?> clazz) {
String name = clazz.getName ();
int index = name.lastIndexOf ('.');
Expand Down
Loading