Scene editor: when uses chromium sends the key data.

PhaserEditor2D · PhaserEditor2D · commit b32f51db31ba · 2019-07-03T12:23:58.000-04:00
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/Editor.ts b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/Editor.ts
@@ -1,7 +1,9 @@
 namespace PhaserEditor2D {
 
+
     export class Editor {
 
+
         private static _instance: Editor;
         private _socket: WebSocket;
         private _game: Phaser.Game;
@@ -12,6 +14,7 @@ namespace PhaserEditor2D {
         private _pendingMouseDownEvent: MouseEvent;
         private _closed = false;
         private _isReloading = false;
+        private _sendKeyData = false;
 
         sceneProperties: any;
         selection: any[] = [];
@@ -115,6 +118,21 @@ namespace PhaserEditor2D {
 
         }
 
+        sendKeyDown(e: KeyboardEvent) {
+            if (this._sendKeyData) {
+                const data = {
+                    keyCode: e.keyCode,
+                    ctrlKey: e.ctrlKey,
+                    shiftKey: e.shiftKey,
+                };
+
+                this.sendMessage({
+                    method: "KeyDown",
+                    data: data
+                })
+            }
+        }
+
         private onResize() {
 
             for (let scene of this._game.scene.scenes) {
@@ -258,6 +276,7 @@ namespace PhaserEditor2D {
             // update the model
 
             this._webgl = msg.webgl;
+            this._sendKeyData = msg.sendKeyData || false;
             this.sceneProperties = msg.sceneProperties;
 
             // create the game
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/main.ts b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/main.ts
@@ -2,18 +2,11 @@ function main() {
     new PhaserEditor2D.Editor();
 }
 
-window.addEventListener("keydown", function (e) {
+window.addEventListener("keydown", function (e : KeyboardEvent) {
+    PhaserEditor2D.Editor.getInstance().sendKeyDown(e);
     e.preventDefault();
     e.stopImmediatePropagation();
 });
 
 
-window.addEventListener("load", main);
-
-
-var CONSOLE_LOG = false;
-function consoleLog(msg: any) {
-    if (CONSOLE_LOG) {
-        console.log(msg);
-    }
-}
+window.addEventListener("load", main);
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/Editor.js b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/Editor.js
@@ -4,6 +4,7 @@ var PhaserEditor2D;
         function Editor() {
             this._closed = false;
             this._isReloading = false;
+            this._sendKeyData = false;
             this.selection = [];
             Editor._instance = this;
             this.openSocket();
@@ -81,6 +82,19 @@ var PhaserEditor2D;
                 method: "GetInitialState"
             });
         };
+        Editor.prototype.sendKeyDown = function (e) {
+            if (this._sendKeyData) {
+                var data = {
+                    keyCode: e.keyCode,
+                    ctrlKey: e.ctrlKey,
+                    shiftKey: e.shiftKey
+                };
+                this.sendMessage({
+                    method: "KeyDown",
+                    data: data
+                });
+            }
+        };
         Editor.prototype.onResize = function () {
             for (var _i = 0, _a = this._game.scene.scenes; _i < _a.length; _i++) {
                 var scene = _a[_i];
@@ -191,6 +205,7 @@ var PhaserEditor2D;
         };
         Editor.prototype.onCreateGame = function (msg) {
             this._webgl = msg.webgl;
+            this._sendKeyData = msg.sendKeyData || false;
             this.sceneProperties = msg.sceneProperties;
             this._create = new PhaserEditor2D.Create();
             this._game = new Phaser.Game({
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/main.js b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/main.js
@@ -2,13 +2,8 @@ function main() {
     new PhaserEditor2D.Editor();
 }
 window.addEventListener("keydown", function (e) {
+    PhaserEditor2D.Editor.getInstance().sendKeyDown(e);
     e.preventDefault();
     e.stopImmediatePropagation();
 });
 window.addEventListener("load", main);
-var CONSOLE_LOG = false;
-function consoleLog(msg) {
-    if (CONSOLE_LOG) {
-        console.log(msg);
-    }
-}
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/screenshot.js b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/screenshot.js
@@ -134,5 +134,3 @@ var PhaserEditor2D;
     })(Screenshot = PhaserEditor2D.Screenshot || (PhaserEditor2D.Screenshot = {}));
 })(PhaserEditor2D || (PhaserEditor2D = {}));
 window.addEventListener("load", PhaserEditor2D.Screenshot.mainScreenshot);
-function consoleLog(msg) {
-}
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/workaround.js b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/out/workaround.js
@@ -2,6 +2,12 @@ window.addEventListener("onerror", function (e) {
     alert("WebView ERROR: " + e);
 });
 window.AudioContext = function () { };
+var CONSOLE_LOG = false;
+function consoleLog(msg) {
+    if (CONSOLE_LOG) {
+        console.log(msg);
+    }
+}
 var PhaserEditor2D;
 (function (PhaserEditor2D) {
     function isLeftButton(e) {
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/screenshot.ts b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/screenshot.ts
@@ -137,8 +137,4 @@ namespace PhaserEditor2D.Screenshot {
     }
 }
 
-window.addEventListener("load", PhaserEditor2D.Screenshot.mainScreenshot);
-
-function consoleLog(msg) {
-    // do nothing
-}
+window.addEventListener("load", PhaserEditor2D.Screenshot.mainScreenshot);
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/workaround.ts b/source/v2/phasereditor/phasereditor.scene.ui.editor.html/html/workaround.ts
@@ -6,6 +6,15 @@ window.addEventListener("onerror", function (e) {
 (<any>window).AudioContext = function () {};
 
 
+// disable log on production
+var CONSOLE_LOG = false;
+function consoleLog(msg: any) {
+    if (CONSOLE_LOG) {
+        console.log(msg);
+    }
+}
+
+
 namespace PhaserEditor2D {
     export function isLeftButton(e : MouseEvent) {
         if (e.buttons === undefined) {
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor/src/phasereditor/scene/ui/editor/SceneEditorBroker.java b/source/v2/phasereditor/phasereditor.scene.ui.editor/src/phasereditor/scene/ui/editor/SceneEditorBroker.java
@@ -24,11 +24,17 @@
 import static phasereditor.ui.PhaserEditorUI.swtRun;
 
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
 import java.util.function.BiConsumer;
 
+import org.eclipse.jface.bindings.Binding;
+import org.eclipse.jface.bindings.keys.KeySequence;
+import org.eclipse.jface.bindings.keys.KeyStroke;
 import org.eclipse.jface.util.LocalSelectionTransfer;
 import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.swt.SWT;
+import org.eclipse.ui.keys.IBindingService;
 import org.json.JSONObject;
 
 import phasereditor.scene.core.DisplayComponent;
@@ -156,6 +162,9 @@ private void messageReceived(Object client, JSONObject msg) {
 			case "PasteEvent":
 				onPasteEvent(msg);
 				break;
+			case "KeyDown":
+				onKeyDown(msg);
+				break;
 			default:
 				break;
 			}
@@ -164,6 +173,47 @@ private void messageReceived(Object client, JSONObject msg) {
 		}
 	}
 
+	private void onKeyDown(JSONObject msg) {
+		var args = msg.getJSONObject("data");
+		int keyCode = args.optInt("keyCode");
+		boolean isCtrl = args.optBoolean("ctrl");
+		boolean isShift = args.optBoolean("shift");
+
+		var bindingService = _editor.getSite().getService(IBindingService.class);
+		int modifier = 0;
+		if (isCtrl)
+			modifier = SWT.CTRL;
+		if (isShift)
+			modifier = SWT.SHIFT | modifier;
+		if (keyCode == 46 || keyCode == 8)
+			keyCode = SWT.DEL;
+		else if (keyCode == 115)
+			keyCode = SWT.F4;
+		var perfectMatch = bindingService
+				.getPerfectMatch(KeySequence.getInstance(KeyStroke.getInstance(modifier, keyCode)));
+		if (perfectMatch == null) {
+			@SuppressWarnings("unchecked")
+			Collection<Binding> partialMatches = bindingService
+					.getConflictsFor(KeySequence.getInstance(KeyStroke.getInstance(modifier, keyCode)));
+			if (partialMatches != null)
+				for (Binding bid : partialMatches) {
+					if (bid.getParameterizedCommand().getCommand().isEnabled()) {
+						perfectMatch = bid;
+					}
+				}
+		}
+		if (perfectMatch != null && perfectMatch.getParameterizedCommand().getCommand().isEnabled()) {
+			var perfectMatch2 = perfectMatch;
+			swtRun(() -> {
+				try {
+					perfectMatch2.getParameterizedCommand().executeWithChecks(null, null);
+				} catch (Exception e) {
+					SceneUIEditor.logError(e);
+				}
+			});
+		}
+	}
+
 	private void onPasteEvent(JSONObject msg) {
 		var x = msg.getFloat("x");
 		var y = msg.getFloat("y");
diff --git a/source/v2/phasereditor/phasereditor.scene.ui.editor/src/phasereditor/scene/ui/editor/messages/CreateGameMessage.java b/source/v2/phasereditor/phasereditor.scene.ui.editor/src/phasereditor/scene/ui/editor/messages/CreateGameMessage.java
@@ -33,6 +33,7 @@
 import phasereditor.scene.core.PackReferencesCollector;
 import phasereditor.scene.ui.editor.SceneEditor;
 import phasereditor.scene.ui.editor.SceneUIEditor;
+import phasereditor.ui.PhaserEditorUI;
 import phasereditor.webrun.core.ApiMessage;
 import phasereditor.webrun.core.WebRunCore;
 
@@ -71,9 +72,12 @@ public CreateGameMessage(SceneEditor editor) {
 					break;
 				}
 			}
-
+			
+			var sendKeyData = PhaserEditorUI.useChromuiumBrowser();
+			
 			_data.put("method", "CreateGame");
 			_data.put("webgl", webgl);
+			_data.put("sendKeyData", sendKeyData);
 			_data.put("displayList", displayListData);
 			_data.put("sceneProperties", scenePropertiesData);
 		}

Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,4 @@ namespace PhaserEditor2D.Screenshot {`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
`140`		`-window.addEventListener("load", PhaserEditor2D.Screenshot.mainScreenshot);`
`141`		`-`
`142`		`-function consoleLog(msg) {`
`143`		`- // do nothing`
`144`		`-}`
	`140`	`+window.addEventListener("load", PhaserEditor2D.Screenshot.mainScreenshot);`