state restore

Author: codeanticode

core/src/processing/android/PWatchFaceCanvas.java

@@ -190,6 +190,16 @@ public void onVisibilityChanged(boolean visible) {
       }
     }
 
+    @Override
+    public void onSurfaceChanged(SurfaceHolder holder, int format, int width, int height) {
+      super.onSurfaceChanged(holder, format, width, height);
+      if (sketch != null) {
+        sketch.displayWidth = width;
+        sketch.displayHeight = height;
+        sketch.g.setSize(sketch.sketchWidth(), sketch.sketchHeight());
+        sketch.surfaceChanged();
+      }
+    }
 
     @Override
     public void onPeekCardPositionUpdate(Rect rect) {

core/src/processing/core/PApplet.java

@@ -582,9 +582,8 @@ public void onResume() {
 
     // TODO need to bring back app state here!
     // At least we restore the current style.
-    if (savedStyle != null) {
+    if (savedStyle != null && g != null) {
       g.style(savedStyle);
-      savedStyle = null;
     }
 
     handleMethods("resume");
@@ -597,8 +596,10 @@ public void onResume() {
   public void onPause() {
     // TODO need to save all application state here!
     // At least we save the current style.
-    savedStyle = new PStyle();
-    g.getStyle(savedStyle);
+    if (g != null) {
+      savedStyle = new PStyle();
+      g.getStyle(savedStyle);
+    }
 
     handleMethods("pause");
 
@@ -698,6 +699,9 @@ public SurfaceView getSurfaceView() {
 
   public void surfaceChanged() {
     surfaceChanged = true;
+    if (savedStyle != null && g != null) {
+      g.style(savedStyle);
+    }
   }
 
 

core/src/processing/core/PGraphicsAndroid2D.java

@@ -128,16 +128,16 @@ public PGraphicsAndroid2D() {
    *
    * Note that this will nuke any cameraMode() settings.
    */
-  @Override
-  public void setSize(int iwidth, int iheight) {  // ignore
-    width = iwidth;
-    height = iheight;
-    width1 = width - 1;
-    height1 = height - 1;
-
-    allocate();
-    reapplySettings();
-  }
+//  @Override
+//  public void setSize(int iwidth, int iheight) {  // ignore
+//    width = iwidth;
+//    height = iheight;
+//    width1 = width - 1;
+//    height1 = height - 1;
+//
+//    allocate();
+//    reapplySettings();
+//  }
 
 
   @Override

core/src/processing/opengl/PGraphicsOpenGL.java

@@ -590,8 +590,8 @@ public void setPrimary(boolean primary) {
 
   @Override
   public void setSize(int iwidth, int iheight) {
-    width = iwidth;
-    height = iheight;
+    super.setSize(iwidth, iheight);
+
     updatePixelSize();
 
     // init perspective projection based on new dimensions