Skip to content

Paint the range indicator with alpha instead of a stipple image #4294

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
vogella wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −94
Open

Paint the range indicator with alpha instead of a stipple image #4294

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
103 changes: 9 additions & 94 deletions ....eclipse.ui.workbench.texteditor/src/org/eclipse/ui/texteditor/DefaultRangeIndicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,11 @@
package org.eclipse.ui.texteditor;


import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.graphics.GC;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.ImageData;
import org.eclipse.swt.graphics.ImageDataProvider;
import org.eclipse.swt.graphics.PaletteData;
import org.eclipse.swt.graphics.Point;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Canvas;
import org.eclipse.swt.widgets.Control;
import org.eclipse.swt.widgets.Display;

import org.eclipse.jface.resource.JFaceResources;

Expand All @@ -45,10 +38,8 @@
public class DefaultRangeIndicator extends Annotation implements IAnnotationPresentation {

private static final String RANGE_INDICATOR_COLOR= "org.eclipse.ui.editors.rangeIndicatorColor"; //$NON-NLS-1$
/** The image of this range indicator */
private Image fImage;
/** The color used to draw the range indicator during the last paint action. */
private Color fLastRangeIndicatorColor;
/** Alpha of the range fill, matching the coverage of the former stipple pattern. */
private static final int FILL_ALPHA= 128;

/**
* Creates a new range indicator.
Expand Down Expand Up @@ -79,96 +70,20 @@ public void paint(GC gc, Canvas canvas, Rectangle bounds) {
return;
}

Color currentRangeIndicatorColor= JFaceResources.getColorRegistry().get(RANGE_INDICATOR_COLOR);
Image image= getImage(canvas, currentRangeIndicatorColor);
gc.drawImage(image, 0, 0, w, h, x, y, w, h);
Color rangeIndicatorColor= JFaceResources.getColorRegistry().get(RANGE_INDICATOR_COLOR);
gc.setBackground(rangeIndicatorColor);

int alpha= gc.getAlpha();
gc.setAlpha(FILL_ALPHA);
gc.fillRectangle(x, y, w, h);
gc.setAlpha(alpha);

gc.setBackground(currentRangeIndicatorColor);
gc.fillRectangle(x, bounds.y, w, b);
gc.fillRectangle(x, bounds.y + bounds.height - b, w, b);

fLastRangeIndicatorColor= currentRangeIndicatorColor;
}

@Override
public int getLayer() {
return IAnnotationPresentation.DEFAULT_LAYER;
}

/**
* Returns the image of this range indicator.
*
* @param control the control
* @param rangeIndicatorColor the color to be used to paint the range indicator
* @return an image
*/
private Image getImage(Control control, Color rangeIndicatorColor) {
if (fImage == null) {
fImage= createImage(control.getDisplay(), control.getSize(), rangeIndicatorColor);

control.addDisposeListener(e -> {
if (fImage != null && !fImage.isDisposed()) {
fImage.dispose();
fImage = null;
}
});
} else {
Rectangle imageRectangle= fImage.getBounds();
Point controlSize= control.getSize();

if (imageRectangle.width < controlSize.x || imageRectangle.height < controlSize.y
|| !rangeIndicatorColor.equals(fLastRangeIndicatorColor)) {
fImage.dispose();
fImage= createImage(control.getDisplay(), controlSize, rangeIndicatorColor);
}
}

return fImage;
}

/**
* Creates and returns a new SWT image with the given size on
* the given display which is used as this range indicator's image.
*
* @param display the display on which to create the image
* @param size the image size
* @param rangeIndicatorColor the color to be used to paint the range indicator
* @return a new image
*/
private static Image createImage(Display display, Point size, Color rangeIndicatorColor) {

int width = size.x;
int height = size.y;

ImageDataProvider imageDataProvider = zoom -> {
float scaleFactor = zoom / 100.0f;
int scaledWidth = Math.round(width * scaleFactor);
int scaledHeight = Math.round(height * scaleFactor);
ImageData imageData = new ImageData(scaledWidth, scaledHeight, 1,
createPalette(display, rangeIndicatorColor));
int blockSize = Math.round(scaleFactor);
for (int y = 0; y < scaledHeight; y++) {
for (int x = 0; x < scaledWidth; x++) {
if (((x / blockSize) + (y / blockSize)) % 2 == 0) {
imageData.setPixel(x, y, 1);
}
}
}
imageData.transparentPixel = 1;
return imageData;
};

return new Image(display, imageDataProvider);
}

/**
* Creates and returns a new color palette data.
*
* @param display the display
* @param rangeIndicatorColor the color to be used to paint the range indicator
* @return the new color palette data
*/
private static PaletteData createPalette(Display display, Color rangeIndicatorColor) {
return new PaletteData(rangeIndicatorColor.getRGB(), display.getSystemColor(SWT.COLOR_WIDGET_BACKGROUND).getRGB());
}
}
Loading