Extension

Author: akoch-yatta

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/AnnotationRulerColumn.java

@@ -527,24 +527,25 @@ private void doubleBufferPaint(GC dest) {
 		if (fBuffer == null) {
 			fBuffer= new Image(fCanvas.getDisplay(), this::doPaint, size.x, size.y);
 		} else {
-			doPaint(new GC(fBuffer), size.x, size.y);
+			GC gc= new GC(fBuffer);
+			try {
+				doPaint(gc, size.x, size.y);
+			} finally {
+				gc.dispose();
+			}
 		}
 		dest.drawImage(fBuffer, 0, 0);
 	}
 
 	private void doPaint(GC gc, int width, int height) {
 		gc.setFont(fCachedTextWidget.getFont());
-		try {
-			gc.setBackground(fCanvas.getBackground());
-			gc.fillRectangle(0, 0, width, height);
+		gc.setBackground(fCanvas.getBackground());
+		gc.fillRectangle(0, 0, width, height);
 
-			if (fCachedTextViewer instanceof ITextViewerExtension5)
-				doPaint1(gc);
-			else
-				doPaint(gc);
-		} finally {
-			gc.dispose();
-		}
+		if (fCachedTextViewer instanceof ITextViewerExtension5)
+			doPaint1(gc);
+		else
+			doPaint(gc);
 	}
 
 	/**

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/ChangeRulerColumn.java

@@ -259,7 +259,12 @@ private void doubleBufferPaint(GC dest) {
 		if (fBuffer == null) {
 			fBuffer= new Image(fCanvas.getDisplay(), this::doPaint, size.x, size.y);
 		} else {
-			doPaint(new GC(fBuffer), size.x, size.y);
+			GC gc= new GC(fBuffer);
+			try {
+				doPaint(gc, size.x, size.y);
+			} finally {
+				gc.dispose();
+			}
 		}
 
 		dest.drawImage(fBuffer, 0, 0);
@@ -291,15 +296,10 @@ protected final boolean isViewerCompletelyShown() {
 
 	private void doPaint(GC gc, int width, int height) {
 		gc.setFont(fCanvas.getFont());
+		gc.setBackground(getBackground());
+		gc.fillRectangle(0, 0, width, height);
 
-		try {
-			gc.setBackground(getBackground());
-			gc.fillRectangle(0, 0, width, height);
-
-			doPaint(gc);
-		} finally {
-			gc.dispose();
-		}
+		doPaint(gc);
 	}
 
 	/**

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/OverviewRuler.java

@@ -686,23 +686,24 @@ private void doubleBufferPaint(GC dest) {
 		if (fBuffer == null) {
 			fBuffer= new Image(fCanvas.getDisplay(), this::doPaint, size.x, size.y);
 		} else {
-			doPaint(new GC(fBuffer), size.x, size.y);
+			GC gc= new GC(fBuffer);
+			try {
+				doPaint(gc, size.x, size.y);
+			} finally {
+				gc.dispose();
+			}
 		}
 
 		dest.drawImage(fBuffer, 0, 0);
 	}
 
 	private void doPaint(GC gc, int width, int height) {
-		try {
-			gc.setBackground(fCanvas.getBackground());
-			gc.fillRectangle(0, 0, width, height);
+		gc.setBackground(fCanvas.getBackground());
+		gc.fillRectangle(0, 0, width, height);
 
-			cacheAnnotations();
+		cacheAnnotations();
 
-			doPaint(gc);
-		} finally {
-			gc.dispose();
-		}
+		doPaint(gc);
 	}
 
 	private void cacheAnnotations() {

bundles/org.eclipse.jface.text/src/org/eclipse/jface/text/source/VerticalRuler.java

@@ -159,6 +159,13 @@ public Control createControl(Composite parent, ITextViewer textViewer) {
 			fTextViewer= null;
 		});
 
+		fCanvas.addListener(SWT.ZoomChanged, e -> {
+			if (fBuffer != null) {
+				fBuffer.dispose();
+				fBuffer= null;
+			}
+		});
+
 		fCanvas.addMouseListener(new MouseListener() {
 			@Override
 			public void mouseUp(MouseEvent event) {
@@ -223,27 +230,30 @@ private void doubleBufferPaint(GC dest) {
 				fBuffer= null;
 			}
 		}
-		if (fBuffer == null)
-			fBuffer= new Image(fCanvas.getDisplay(), size.x, size.y);
-
-		GC gc= new GC(fBuffer);
-		gc.setFont(fTextViewer.getTextWidget().getFont());
-		try {
-			gc.setBackground(fCanvas.getBackground());
-			gc.fillRectangle(0, 0, size.x, size.y);
-
-			if (fTextViewer instanceof ITextViewerExtension5)
-				doPaint1(gc);
-			else
-				doPaint(gc);
 
-		} finally {
-			gc.dispose();
+		if (fBuffer == null) {
+			fBuffer= new Image(fCanvas.getDisplay(), this::doPaint, size.x, size.y);
+		} else {
+			GC gc= new GC(fBuffer);
+			try {
+				doPaint(gc, size.x, size.y);
+			} finally {
+				gc.dispose();
+			}
 		}
-
 		dest.drawImage(fBuffer, 0, 0);
 	}
 
+	private void doPaint(GC gc, int width, int height) {
+		gc.setBackground(fCanvas.getBackground());
+		gc.fillRectangle(0, 0, width, height);
+
+		if (fTextViewer instanceof ITextViewerExtension5)
+			doPaint1(gc);
+		else
+			doPaint(gc);
+	}
+
 	/**
 	 * Returns the document offset of the upper left corner of the
 	 * widgets view port, possibly including partially visible lines.