Skip to content

Converting Support tray to use Image with constructor that utilizes imageGCDrawer instead of imageData #3013

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

Converting Support tray to use Image with constructor that utilizes imageGCDrawer instead of imageData #3013

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
60 changes: 30 additions & 30 deletions ...rg.eclipse.ui.workbench/eclipseui/org/eclipse/ui/internal/statushandlers/SupportTray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.graphics.PaletteData;
import org.eclipse.swt.graphics.ImageGcDrawer;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.layout.GridData;
Expand Down Expand Up @@ -66,6 +66,8 @@ public SupportTray(Map<Object, Object> dialogState, Listener listener) {
private boolean hideSupportButtons;
private Image normal;
private Image hover;
private static final int[] closeButtonPolygon = new int[] { 3, 3, 5, 3, 7, 5, 8, 5, 10, 3, 12, 3, 12, 5, 10, 7, 10,
8, 12, 10, 12, 12, 10, 12, 8, 10, 7, 10, 5, 12, 3, 12, 3, 10, 5, 8, 5, 7, 3, 5 };

/**
* This composite occupies the whole space that is available to the support
Expand Down Expand Up @@ -142,40 +144,38 @@ protected Control createContents(Composite parent) {
*/
private void createImages() {
Display display = Display.getCurrent();
int[] shape = new int[] { 3, 3, 5, 3, 7, 5, 8, 5, 10, 3, 12, 3, 12, 5, 10, 7, 10, 8, 12, 10, 12, 12, 10, 12, 8,
10, 7, 10, 5, 12, 3, 12, 3, 10, 5, 8, 5, 7, 3, 5 };

/*
* Use magenta as transparency color since it is used infrequently.
*/

Color border = display.getSystemColor(SWT.COLOR_WIDGET_DARK_SHADOW);
Color background = display.getSystemColor(SWT.COLOR_LIST_BACKGROUND);
Color backgroundHot = new Color(display, new RGB(252, 160, 160));
Color transparent = display.getSystemColor(SWT.COLOR_MAGENTA);

PaletteData palette = new PaletteData(
new RGB[] { transparent.getRGB(), border.getRGB(), background.getRGB(), backgroundHot.getRGB() });
ImageData data = new ImageData(16, 16, 8, palette);
data.transparentPixel = 0;

normal = new Image(display, data);
normal.setBackground(transparent);
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The setBackground call on the image has been omitted because it has no visible impact; the GC sets the image background to transparent.

GC gc = new GC(normal);
gc.setBackground(background);
gc.fillPolygon(shape);
gc.setForeground(border);
gc.drawPolygon(shape);
gc.dispose();

hover = new Image(display, data);
hover.setBackground(transparent);
gc = new GC(hover);
gc.setBackground(backgroundHot);
gc.fillPolygon(shape);
gc.setForeground(border);
gc.drawPolygon(shape);
gc.dispose();
normal = new Image(display, createCloseButtonDrawer(background, border), 16, 16);
hover = new Image(display, createCloseButtonDrawer(backgroundHot, border), 16, 16);
}

private ImageGcDrawer createCloseButtonDrawer(Color fillColor, Color borderColor) {

return new ImageGcDrawer() {
@Override
public void drawOn(GC gc, int width, int height) {
gc.setBackground(fillColor);
gc.fillPolygon(closeButtonPolygon);
gc.setForeground(borderColor);
gc.drawPolygon(closeButtonPolygon);
gc.dispose();
}

@Override
public void postProcess(ImageData imageData) {
// Used to remove opaque background in the image.
imageData.transparentPixel = 0;
}

@Override
public int getGcStyle() {
return SWT.TRANSPARENT;
}
};
}

/**
Expand Down
Loading