(v2) Scene editor: listen ENTER key to close the quick asset dialog.

Author: PhaserEditor2D

source/v2/phasereditor/phasereditor.scene.core/src/phasereditor/scene/core/codegen/SceneCodeDomBuilder.java

@@ -31,6 +31,7 @@
 import phasereditor.assetpack.core.ImageAssetModel;
 import phasereditor.assetpack.core.SpritesheetAssetModel;
 import phasereditor.project.core.ProjectCore;
+import phasereditor.scene.core.AnimationsComponent;
 import phasereditor.scene.core.BitmapTextComponent;
 import phasereditor.scene.core.BitmapTextModel;
 import phasereditor.scene.core.DynamicBitmapTextComponent;
@@ -152,6 +153,10 @@ private MethodDeclDom buildCreateMethod(SceneModel sceneModel) {
 				assignToVar = buildDynamicBitmapTextProps(methodDecl, model) || assignToVar;
 			}
 
+			if (model instanceof AnimationsComponent) {
+				assignToVar = buildAnimationsProps(methodDecl, model) || assignToVar;
+			}
+
 			if (assignToVar && methodCall != null) {
 				methodCall.setReturnToVar(varname(model));
 			}
@@ -190,6 +195,24 @@ private MethodDeclDom buildCreateMethod(SceneModel sceneModel) {
 		return methodDecl;
 	}
 
+	@SuppressWarnings("static-method")
+	private boolean buildAnimationsProps(MethodDeclDom methodDecl, ObjectModel model) {
+		var key = AnimationsComponent.get_autoPlayAnimKey(model);
+
+		if (key == null) {
+			return false;
+		}
+
+		var name = varname(model);
+
+		var instr = new MethodCallDom("play", name + ".anims");
+		instr.argLiteral(key);
+
+		methodDecl.getInstructions().add(instr);
+
+		return true;
+	}
+
 	@SuppressWarnings("static-method")
 	private boolean buildFlipProps(MethodDeclDom methodDecl, ObjectModel model) {
 

source/v2/phasereditor/phasereditor.scene.ui/src/phasereditor/scene/ui/editor/properties/AnimationsSection.java

@@ -95,14 +95,19 @@ public Control createContent(Composite parent) {
 	private void clearAnimation() {
 
 		wrapOperation(() -> {
+			
 			getModels().forEach(model -> AnimationsComponent.set_autoPlayAnimKey(model, null));
+			
 		}, getModels());
 
+		getEditor().setDirty(true);
+		
 		update_UI_from_Model();
 	}
 
 	private void browseAnimation() {
 		var dlg = new QuickSelectAssetDialog(getEditor().getEditorSite().getShell());
+		dlg.setTitle("Select Animation");
 
 		dlg.setInput(getAnimations());
 
@@ -114,6 +119,8 @@ private void browseAnimation() {
 					AnimationsComponent.set_autoPlayAnimKey(model, anim.getKey());
 				});
 			}, getModels());
+				
+			getEditor().setDirty(true);
 
 			update_UI_from_Model();
 		}

source/v2/phasereditor/phasereditor.scene.ui/src/phasereditor/scene/ui/editor/properties/QuickSelectAssetDialog.java

@@ -21,6 +21,10 @@
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 package phasereditor.scene.ui.editor.properties;
 
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.events.KeyAdapter;
+import org.eclipse.swt.events.KeyEvent;
 import org.eclipse.swt.events.MouseListener;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Shell;
@@ -44,18 +48,45 @@ protected TreeCanvasViewer createViewer(TreeCanvas tree) {
 		var viewer = new AssetsTreeCanvasViewer(tree, new AssetsContentProvider(), AssetLabelProvider.GLOBAL_16);
 
 		tree.addMouseListener(MouseListener.mouseDoubleClickAdapter(e -> {
-			setResult(getViewer().getStructuredSelection().getFirstElement());
-			close();
+			closeDialog();
 		}));
 
+		var keyListener = new KeyAdapter() {
+			@Override
+			public void keyReleased(KeyEvent e) {
+				if (e.character == SWT.CR || e.character == SWT.LF) {
+					if (viewer.getStructuredSelection().isEmpty()) {
+						var visibleItems = tree.getVisibleItems();
+
+						if (visibleItems.size() == 1) {
+							var item = visibleItems.get(0);
+							viewer.setSelection(new StructuredSelection(item.getData()));
+						}
+					}
+
+					tree.getDisplay().asyncExec(() -> closeDialog());
+				}
+			}
+		};
+
+		tree.addKeyListener(keyListener);
+
+		getFilteredTree().getTextControl().addKeyListener(keyListener);
+
 		AssetPackUI.installAssetTooltips(tree, tree.getUtils());
-		
+
 		return viewer;
 	}
 
+	protected void closeDialog() {
+		var firstElement = getViewer().getStructuredSelection().getFirstElement();
+
+		setResult(firstElement);
+		close();
+	}
+
 	@Override
 	protected void createButtonsForButtonBar(Composite parent) {
 		// no buttons
 	}
-
 }

source/v2/phasereditor/phasereditor.ui/src/phasereditor/ui/TreeCanvasDialog.java

@@ -40,6 +40,7 @@ public class TreeCanvasDialog extends Dialog {
 	private TreeCanvasViewer _viewer;
 	private Object _input;
 	private Object _result;
+	private String _title;
 
 	public TreeCanvasDialog(Shell shell) {
 		super(shell);
@@ -60,6 +61,10 @@ protected Control createDialogArea(Composite parent) {
 
 		return _filteredTree;
 	}
+	
+	public FilteredTreeCanvas getFilteredTree() {
+		return _filteredTree;
+	}
 
 	@SuppressWarnings("static-method")
 	protected TreeCanvasViewer createViewer(TreeCanvas tree) {
@@ -69,26 +74,42 @@ protected TreeCanvasViewer createViewer(TreeCanvas tree) {
 	public TreeCanvasViewer getViewer() {
 		return _viewer;
 	}
-	
+
 	@Override
 	protected Point getInitialSize() {
 		return new Point(480, 320);
 	}
-	
+
 	public void setInput(Object input) {
 		_input = input;
 	}
-	
+
 	public Object getInput() {
 		return _input;
 	}
-	
+
 	public Object getResult() {
 		return _result;
 	}
-	
+
 	public void setResult(Object result) {
 		_result = result;
 	}
 
+	@Override
+	protected void configureShell(Shell newShell) {
+		super.configureShell(newShell);
+		if (_title != null) {
+			newShell.setText(_title);
+		}
+	}
+
+	public String getTitle() {
+		return _title;
+	}
+
+	public void setTitle(String title) {
+		_title = title;
+	}
+
 }