requestFocus() out of PSurface, key events firing in FX

benfry · benfry · commit 0c1ab7c793cd · 2015-05-16T23:25:40.000-04:00
diff --git a/core/src/processing/core/PSurface.java b/core/src/processing/core/PSurface.java
@@ -108,9 +108,9 @@ public void initFrame(PApplet sketch, int backgroundColor,
 
   public void setFrameRate(float fps);
 
-  // called on the first frame so that the now-visible drawing surface can
-  // receive key and mouse events
-  public void requestFocus();
+//  // called on the first frame so that the now-visible drawing surface can
+//  // receive key and mouse events
+//  public void requestFocus();
 
 //  // finish rendering to the screen (called by PApplet)
 //  public void blit();
diff --git a/core/src/processing/core/PSurfaceAWT.java b/core/src/processing/core/PSurfaceAWT.java
@@ -111,7 +111,7 @@ public void componentResized(ComponentEvent e) {
    * invokeLater() happens in here rather than requiring the caller to wrap it.
    */
   @Override
-  public void requestFocus() {
+  void requestFocus() {
     // for 2.0a6, moving this request to the EDT
     EventQueue.invokeLater(new Runnable() {
       public void run() {
diff --git a/core/src/processing/core/PSurfaceFX.java b/core/src/processing/core/PSurfaceFX.java
@@ -115,6 +115,7 @@ public void handle(ScrollEvent e) {
 
       EventHandler<KeyEvent> keyHandler = new EventHandler<KeyEvent>() {
         public void handle(KeyEvent e) {
+          System.out.println(e);
           fxKeyEvent(e);
         }
       };
@@ -231,6 +232,7 @@ public void setVisible(boolean visible) {
     Platform.runLater(new Runnable() {
       public void run() {
         stage.show();
+        canvas.requestFocus();
       }
     });
   }
@@ -408,11 +410,10 @@ public void setFrameRate(float fps) {
   }
 
 
-  @Override
-  public void requestFocus() {
-    // TODO Auto-generated method stub
-
-  }
+//  @Override
+//  public void requestFocus() {
+//    canvas.requestFocus();
+//  }
 
 
   public void setCursor(int kind) {
diff --git a/core/src/processing/core/PSurfaceNone.java b/core/src/processing/core/PSurfaceNone.java
@@ -141,7 +141,7 @@ public void setSmooth(int level) {
 
   }
 
-  public void requestFocus() {
+  void requestFocus() {
     // TODO Auto-generated method stub
 
   }

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ public void setSmooth(int level) {`
`141`	`141`
`142`	`142`	`}`
`143`	`143`
`144`		`- public void requestFocus() {`
	`144`	`+ void requestFocus() {`
`145`	`145`	`// TODO Auto-generated method stub`
`146`	`146`
`147`	`147`	`}`