Skip to content

Commit 53226b1

Browse files
committed
Use JFace's DecorationOverlayIcon in cheatsheets
Remove the internal OverlayIcon with it's overcomplicated API and usage of deprecated SWT APIs.
1 parent c8ea4f0 commit 53226b1

File tree

3 files changed

+5
-175
lines changed

3 files changed

+5
-175
lines changed

ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/AbstractOverlayIcon.java

Lines changed: 0 additions & 130 deletions
This file was deleted.

ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/OverlayIcon.java

Lines changed: 0 additions & 42 deletions
This file was deleted.

ua/org.eclipse.ui.cheatsheets/src/org/eclipse/ui/internal/cheatsheets/composite/explorer/TreeLabelProvider.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*******************************************************************************
2-
* Copyright (c) 2005, 2019 IBM Corporation and others.
2+
* Copyright (c) 2005, 2026 IBM Corporation and others.
33
*
44
* This program and the accompanying materials
55
* are made available under the terms of the Eclipse Public License 2.0
@@ -22,6 +22,8 @@
2222
import org.eclipse.core.runtime.FileLocator;
2323
import org.eclipse.core.runtime.IPath;
2424
import org.eclipse.jface.resource.ImageDescriptor;
25+
import org.eclipse.jface.viewers.DecorationOverlayIcon;
26+
import org.eclipse.jface.viewers.IDecoration;
2527
import org.eclipse.jface.viewers.LabelProvider;
2628
import org.eclipse.swt.SWT;
2729
import org.eclipse.swt.graphics.Image;
@@ -152,8 +154,8 @@ private ImageDescriptor getPredefinedImageDescriptor(String kind) {
152154

153155
private void createImageWithOverlay(int state, String imagePath, ImageSet images, ImageDescriptor baseDescriptor) {
154156
ImageDescriptor descriptor = createImageDescriptor(imagePath);
155-
OverlayIcon icon = new OverlayIcon(baseDescriptor, new ImageDescriptor[][] {
156-
{}, { descriptor } });
157+
DecorationOverlayIcon icon = new DecorationOverlayIcon(baseDescriptor.createImage(), descriptor,
158+
IDecoration.BOTTOM_RIGHT);
157159
images.put(state, icon.createImage());
158160
}
159161

0 commit comments

Comments
 (0)