Skip to content

Draw the ColorCellEditor swatch with an ImageGcDrawer #4375

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

Draft
vogella wants to merge 1 commit into
base: master
Choose a base branch
from
+29 −43
Draft

Draw the ColorCellEditor swatch with an ImageGcDrawer #4375

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
2 changes: 1 addition & 1 deletion bundles/org.eclipse.jface/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Export-Package: org.eclipse.jface,
org.eclipse.jface.window,
org.eclipse.jface.wizard,
org.eclipse.jface.wizard.images
Require-Bundle: org.eclipse.swt;bundle-version="[3.126.0,4.0.0)";visibility:=reexport,
Require-Bundle: org.eclipse.swt;bundle-version="[3.130.0,4.0.0)";visibility:=reexport,
org.eclipse.core.commands;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
org.eclipse.equinox.common;bundle-version="[3.18.0,4.0.0)",
org.eclipse.equinox.bidi;bundle-version="[0.10.0,2.0.0)";resolution:=optional
Expand Down
70 changes: 28 additions & 42 deletions bundles/org.eclipse.jface/src/org/eclipse/jface/viewers/ColorCellEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
import org.eclipse.swt.graphics.FontMetrics;
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.graphics.Rectangle;
import org.eclipse.swt.widgets.ColorDialog;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Layout;
import org.eclipse.swt.widgets.Table;
Expand Down Expand Up @@ -133,55 +133,43 @@ public ColorCellEditor(Composite parent, int style) {
}

/**
* Creates and returns the color image data for the given control
* and RGB value. The image's size is either the control's item extent
* or the cell editor's default extent, which is 16 pixels square.
*
* @param w the control
* @param color the color
* Creates the swatch image for the given color, sized to the item height of
* the control.
*/
private ImageData createColorImage(Control w, RGB color) {
private Image createColorImage(Control w, RGB color) {

GC gc = new GC(w);
FontMetrics fm = gc.getFontMetrics();
int size = fm.getAscent();
int ascent = fm.getAscent();
gc.dispose();

int indent = 6;
int extent = DEFAULT_EXTENT;
if (w instanceof Table) {
extent = ((Table) w).getItemHeight() - 1;
} else if (w instanceof Tree) {
extent = ((Tree) w).getItemHeight() - 1;
}

if (size > extent) {
size = extent;
if (w instanceof Table table) {
extent = table.getItemHeight() - 1;
} else if (w instanceof Tree tree) {
extent = tree.getItemHeight() - 1;
}

int width = indent + size;
int height = extent;

int xoffset = indent;
int yoffset = (height - size) / 2;

RGB black = new RGB(0, 0, 0);
PaletteData dataPalette = new PaletteData(black, black, color);
ImageData data = new ImageData(width, height, 4, dataPalette);
data.transparentPixel = 0;

int end = size - 1;
for (int y = 0; y < size; y++) {
for (int x = 0; x < size; x++) {
if (x == 0 || y == 0 || x == end || y == end) {
data.setPixel(x + xoffset, y + yoffset, 1);
} else {
data.setPixel(x + xoffset, y + yoffset, 2);
}
int size = Math.min(ascent, extent);
int yoffset = (extent - size) / 2;
Display display = w.getDisplay();

ImageGcDrawer drawer = new ImageGcDrawer() {
@Override
public void drawOn(GC imageGc, int imageWidth, int imageHeight) {
imageGc.setBackground(new Color(display, color));
imageGc.fillRectangle(indent, yoffset, size, size);
imageGc.setForeground(display.getSystemColor(SWT.COLOR_BLACK));
imageGc.drawRectangle(indent, yoffset, size - 1, size - 1);
}
}

return data;
@Override
public int getGcStyle() {
return SWT.TRANSPARENT;
}
};
return new Image(display, drawer, indent + size, extent);
}

@Override
Expand Down Expand Up @@ -230,9 +218,7 @@ protected void updateContents(Object value) {
image.dispose();
}

ImageData id = createColorImage(colorLabel.getParent().getParent(), rgb);
ImageData mask = id.getTransparencyMask();
image = new Image(colorLabel.getDisplay(), id, mask);
image = createColorImage(colorLabel.getParent().getParent(), rgb);
colorLabel.setImage(image);

rgbLabel
Expand Down
Loading