Attachment #174242 for bug #319796

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




		public void setOn(GC gc, int translateX, int translateY) {
			int xInt = (int) Math.floor(left);
			int yInt = (int) Math.floor(top);
			gc.setClipping(xInt + translateX, yInt + translateY, (int) Math
					.ceil(right)
					- xInt, (int) Math.ceil(bottom) - yInt);
		}

		public void translate(float dx, float dy) {


		AA_MASK = 3 << AA_SHIFT;
		FILL_RULE_MASK = 1 << FILL_RULE_SHIFT; // If changed to more than 1-bit,
		// check references!
		INTERPOLATION_MASK = 3 << INTERPOLATION_SHIFT;
		TEXT_AA_MASK = 3 << TEXT_AA_SHIFT;
		XOR_MASK = 1 << XOR_SHIFT;

		}

		checkSharedClipping();
		currentState.relativeClip.intersect(rect.x, rect.y, rect.right(), rect
				.bottom());
		appliedState.relativeClip = null;
	}


	 */
	public void fillGradient(int x, int y, int w, int h, boolean vertical) {
		checkPaint();
		gc
				.fillGradientRectangle(x + translateX, y + translateY, w, h,
						vertical);
	}

	/**

		changes &= ~XOR_MASK;
		if (changes != 0) {
			if ((changes & INTERPOLATION_MASK) != 0) {
				gc
						.setInterpolation(((hints & INTERPOLATION_MASK) >> INTERPOLATION_SHIFT)
								- INTERPOLATION_WHOLE_NUMBER);
			}

			if ((changes & FILL_RULE_MASK) != 0) {

		initTransform(false);
		if (((appliedState.graphicHints ^ currentState.graphicHints) & FILL_RULE_MASK) != 0) {
			// If there is a pending change to the fill rule, apply it first.
			gc
					.setFillRule(((currentState.graphicHints & FILL_RULE_MASK) >> FILL_RULE_SHIFT)
							- FILL_RULE_WHOLE_NUMBER);
			// As long as the FILL_RULE is stored in a single bit, just toggling
			// it works.
			appliedState.graphicHints ^= FILL_RULE_MASK;

		initTransform(false);
		if (((appliedState.graphicHints ^ currentState.graphicHints) & FILL_RULE_MASK) != 0) {
			// If there is a pending change to the fill rule, apply it first.
			gc
					.setFillRule(((currentState.graphicHints & FILL_RULE_MASK) >> FILL_RULE_SHIFT)
							- FILL_RULE_WHOLE_NUMBER);
			// As long as the FILL_RULE is stored in a single bit, just toggling
			// it works.
			appliedState.graphicHints ^= FILL_RULE_MASK;

				: new Rectangle();
		if (!clipping.isEmpty()) {
			Path flatPath = new Path(path.getDevice(), path, 0.01f);
			flatPath.close();
			PathData pathData = flatPath.getPathData();
			flatPath.dispose();
			Region region = new Region(path.getDevice());

Return to bug 319796

Lines 145-153 Link Here

(-)src/org/eclipse/draw2d/SWTGraphics.java (-13 / +19 lines)
145	public void setOn(GC gc, int translateX, int translateY) {	145	public void setOn(GC gc, int translateX, int translateY) {
146	int xInt = (int) Math.floor(left);	146	int xInt = (int) Math.floor(left);
147	int yInt = (int) Math.floor(top);	147	int yInt = (int) Math.floor(top);
148	gc.setClipping(xInt + translateX, yInt + translateY,	148	gc.setClipping(xInt + translateX, yInt + translateY, (int) Math
149	(int) Math.ceil(right) - xInt, (int) Math.ceil(bottom)	149	.ceil(right)
150	- yInt);	150	- xInt, (int) Math.ceil(bottom) - yInt);
151	}	151	}
152		152
153	public void translate(float dx, float dy) {	153	public void translate(float dx, float dy) {
Lines 226-232 Link Here
226		226
227	AA_MASK = 3 << AA_SHIFT;	227	AA_MASK = 3 << AA_SHIFT;
228	FILL_RULE_MASK = 1 << FILL_RULE_SHIFT; // If changed to more than 1-bit,	228	FILL_RULE_MASK = 1 << FILL_RULE_SHIFT; // If changed to more than 1-bit,
229	// check references!	229	// check references!
230	INTERPOLATION_MASK = 3 << INTERPOLATION_SHIFT;	230	INTERPOLATION_MASK = 3 << INTERPOLATION_SHIFT;
231	TEXT_AA_MASK = 3 << TEXT_AA_SHIFT;	231	TEXT_AA_MASK = 3 << TEXT_AA_SHIFT;
232	XOR_MASK = 1 << XOR_SHIFT;	232	XOR_MASK = 1 << XOR_SHIFT;
Lines 364-371 Link Here
364	}	364	}
365		365
366	checkSharedClipping();	366	checkSharedClipping();
367	currentState.relativeClip.intersect(rect.x, rect.y, rect.right(),	367	currentState.relativeClip.intersect(rect.x, rect.y, rect.right(), rect
368	rect.bottom());	368	.bottom());
369	appliedState.relativeClip = null;	369	appliedState.relativeClip = null;
370	}	370	}
371		371
Lines 558-564 Link Here
558	*/	558	*/
559	public void fillGradient(int x, int y, int w, int h, boolean vertical) {	559	public void fillGradient(int x, int y, int w, int h, boolean vertical) {
560	checkPaint();	560	checkPaint();
561	gc.fillGradientRectangle(x + translateX, y + translateY, w, h, vertical);	561	gc
		562	.fillGradientRectangle(x + translateX, y + translateY, w, h,
		563	vertical);
562	}	564	}
563		565
564	/**	566	/**
Lines 871-878 Link Here
871	changes &= ~XOR_MASK;	873	changes &= ~XOR_MASK;
872	if (changes != 0) {	874	if (changes != 0) {
873	if ((changes & INTERPOLATION_MASK) != 0) {	875	if ((changes & INTERPOLATION_MASK) != 0) {
874	gc.setInterpolation(((hints & INTERPOLATION_MASK) >> INTERPOLATION_SHIFT)	876	gc
875	- INTERPOLATION_WHOLE_NUMBER);	877	.setInterpolation(((hints & INTERPOLATION_MASK) >> INTERPOLATION_SHIFT)
		878	- INTERPOLATION_WHOLE_NUMBER);
876	}	879	}
877		880
878	if ((changes & FILL_RULE_MASK) != 0) {	881	if ((changes & FILL_RULE_MASK) != 0) {
Lines 1085-1092 Link Here
1085	initTransform(false);	1088	initTransform(false);
1086	if (((appliedState.graphicHints ^ currentState.graphicHints) & FILL_RULE_MASK) != 0) {	1089	if (((appliedState.graphicHints ^ currentState.graphicHints) & FILL_RULE_MASK) != 0) {
1087	// If there is a pending change to the fill rule, apply it first.	1090	// If there is a pending change to the fill rule, apply it first.
1088	gc.setFillRule(((currentState.graphicHints & FILL_RULE_MASK) >> FILL_RULE_SHIFT)	1091	gc
1089	- FILL_RULE_WHOLE_NUMBER);	1092	.setFillRule(((currentState.graphicHints & FILL_RULE_MASK) >> FILL_RULE_SHIFT)
		1093	- FILL_RULE_WHOLE_NUMBER);
1090	// As long as the FILL_RULE is stored in a single bit, just toggling	1094	// As long as the FILL_RULE is stored in a single bit, just toggling
1091	// it works.	1095	// it works.
1092	appliedState.graphicHints ^= FILL_RULE_MASK;	1096	appliedState.graphicHints ^= FILL_RULE_MASK;
Lines 1107-1114 Link Here
1107	initTransform(false);	1111	initTransform(false);
1108	if (((appliedState.graphicHints ^ currentState.graphicHints) & FILL_RULE_MASK) != 0) {	1112	if (((appliedState.graphicHints ^ currentState.graphicHints) & FILL_RULE_MASK) != 0) {
1109	// If there is a pending change to the fill rule, apply it first.	1113	// If there is a pending change to the fill rule, apply it first.
1110	gc.setFillRule(((currentState.graphicHints & FILL_RULE_MASK) >> FILL_RULE_SHIFT)	1114	gc
1111	- FILL_RULE_WHOLE_NUMBER);	1115	.setFillRule(((currentState.graphicHints & FILL_RULE_MASK) >> FILL_RULE_SHIFT)
		1116	- FILL_RULE_WHOLE_NUMBER);
1112	// As long as the FILL_RULE is stored in a single bit, just toggling	1117	// As long as the FILL_RULE is stored in a single bit, just toggling
1113	// it works.	1118	// it works.
1114	appliedState.graphicHints ^= FILL_RULE_MASK;	1119	appliedState.graphicHints ^= FILL_RULE_MASK;
Lines 1117-1122 Link Here
1117	: new Rectangle();	1122	: new Rectangle();
1118	if (!clipping.isEmpty()) {	1123	if (!clipping.isEmpty()) {
1119	Path flatPath = new Path(path.getDevice(), path, 0.01f);	1124	Path flatPath = new Path(path.getDevice(), path, 0.01f);
		1125	flatPath.close();
1120	PathData pathData = flatPath.getPathData();	1126	PathData pathData = flatPath.getPathData();
1121	flatPath.dispose();	1127	flatPath.dispose();
1122	Region region = new Region(path.getDevice());	1128	Region region = new Region(path.getDevice());