Preview: fix DnD from sorted grid atlas.

Author: PhaserEditor2D

source/phasereditor/phasereditor.assetpack.ui/src/phasereditor/assetpack/ui/preview/AtlasAssetPreviewComp.java

@@ -152,7 +152,8 @@ private ISelection getSelection() {
 						return StructuredSelection.EMPTY;
 					}
 
-					Frame frame = getModel().getAtlasFrames().get(index);
+					List<Frame> frames = getSortedFrames();
+					Frame frame = frames.get(index);
 					return new StructuredSelection(frame);
 				}
 
@@ -235,7 +236,7 @@ private void moveTop(Control control) {
 		layout();
 
 		updateActionsState();
-		
+
 		control.setFocus();
 	}
 
@@ -261,13 +262,12 @@ public void setModel(AtlasAssetModel model) {
 		_canvas.setImageFile(file);
 
 		List<Frame> frames = model.getAtlasFrames();
-		frames = frames.stream().sorted((f1, f2) -> f1.getKey().toLowerCase().compareTo(f2.getKey().toLowerCase()))
-				.collect(toList());
 
 		_canvas.setFrames(frames);
 		_canvas.redraw();
 
 		_spritesList.getViewer().setInput(model);
+		// sort frames by name
 		_spritesList.getViewer().setComparator(new ViewerComparator() {
 			@Override
 			public int compare(Viewer viewer, Object e1, Object e2) {
@@ -281,7 +281,9 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 		if (img != null) {
 			Rectangle b = img.getBounds();
 
-			List<String> tooltips = frames.stream().map(f -> {
+			List<Frame> sortedFrames = getSortedFrames();
+
+			List<String> tooltips = sortedFrames.stream().map(f -> {
 				String str = "Sprite Name: " + f.getKey() + "\n";
 				str += "Sprite Size: " + f.getSpriteW() + "x" + f.getSpriteH() + "\n";
 				str += "Image Size: " + b.width + "x" + b.height + "\n";
@@ -292,9 +294,10 @@ public int compare(Viewer viewer, Object e1, Object e2) {
 			_canvas.setTooltips(tooltips);
 
 			_gridCanvas.setImage(img);
-			_gridCanvas.setFrames(frames.stream().map(f -> f.getFrameData().src).collect(Collectors.toList()));
+			_gridCanvas.setFrames(sortedFrames.stream().map(f -> f.getFrameData().src).collect(Collectors.toList()));
 
 			_gridCanvas.setTooltips(tooltips);
+
 			getDisplay().asyncExec(() -> {
 				_gridCanvas.fitWindow();
 				_gridCanvas.redraw();
@@ -365,4 +368,12 @@ public IZoomable getImageCanvas() {
 
 		updateActionsState();
 	}
+
+	/**
+	 * @return
+	 */
+	private List<Frame> getSortedFrames() {
+		return getModel().getAtlasFrames().stream()
+				.sorted((f1, f2) -> f1.getKey().toLowerCase().compareTo(f2.getKey().toLowerCase())).collect(toList());
+	}
 }

source/phasereditor/phasereditor.ui/src/phasereditor/ui/SpriteGridCanvas.java

@@ -144,7 +144,7 @@ public void mouseDown(MouseEvent e) {
 	}
 
 	private void afterCreateWidgets() {
-		// scrollable canvas do not get the rigth style
+		// scrollable canvas do not get the right style
 		PhaserEditorUI.forceApplyCompositeStyle(this);
 	}