Merge branch 'V4.0' of https://code.ill.fr/instrument-control/nomad-gui

into V4.0

# Conflicts:
#	ChangeLog

ChangeLog

@@ -4,14 +4,12 @@
 
 4.0.121 24/08/2021
 -------
-* coup dans l'eau ;-)
-
+* Corrected two bugs related to old plot: Bad size of plot in spy and toolbar buttons not redrawn when being selected.
 
 4.0.120 20/08/2021
 -------
 * Specific for D11: Display beamstop plugin in "more options" view if beamstop is not correct at start.
 
-
 4.0.119 17/08/2021
 -------
 * Implement "breaking news", allowing to display a specific message at start.

src/main/java/fr/ill/ics/client/view/util/listener/swt/SWTToggleAsyncExecCanvas.java

@@ -65,6 +65,7 @@ public class SWTToggleAsyncExecCanvas extends SWTAsyncExecCanvas {
 		} else {
 			image = enabledImage;
 		}
+		this.redraw();
 	}
 	
 	// MouseTrackListener methods

src/main/java/fr/ill/ics/client/view/widget/plot/launcher/swt/SWTPlotLauncherImageButton.java

@@ -26,8 +26,11 @@ import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
 import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.opengl.GLCanvas;
 
 import fr.ill.ics.client.control.plot.PlotData;
+import fr.ill.ics.client.view.factory.swt.SWTWidgetFactory;
 import fr.ill.ics.client.view.magnifier.Magnifier;
 import fr.ill.ics.client.view.util.listener.swt.SWTMouseTracker;
 import fr.ill.ics.client.view.widget.PContainer;
@@ -52,6 +55,13 @@ public class SWTPlotLauncherImageButton extends PlotLauncherImageButton implemen
 		
 		openGLCanvas = ((SWTMiniPlotViewer)miniPlotViewer).getSWTOpenGLCanvas();
 		
+		// Set the correct size to the GridData, problem found in spy.
+		GLCanvas canvas = openGLCanvas.getCanvas();
+		GridData canvasGridData = SWTWidgetFactory.getInstance().getGridData(); 
+		canvasGridData.heightHint = imageHeight;
+		canvasGridData.widthHint = imageHeight;
+		canvas.setLayoutData(canvasGridData);
+		
 		openGLCanvas.getCanvas().addMouseListener(new MouseAdapter() {
 			public void mouseDown(MouseEvent event) {
 				if (event.button == 1) {