fixed set size

Author: codeanticode

core/src/processing/android/PWatchFaceGLES.java

@@ -59,8 +59,6 @@ public boolean canDraw() {
   }
 
   private class GLEngine extends Gles2WatchFaceService.Engine {
-//    private static final long TICK_PERIOD_MILLIS = 100;
-//    private Handler timeTick;
 
     @Override
     public void onCreate(SurfaceHolder surfaceHolder) {
@@ -74,40 +72,11 @@ public void onCreate(SurfaceHolder surfaceHolder) {
               .build());
       if (sketch != null) {
         sketch.initSurface(PWatchFaceGLES.this, null);
-//        graphics = sketch.g;
         sketch.start();
       }
-
-//      timeTick = new Handler(Looper.myLooper());
-//      startTimerIfNecessary();
-
-    }
-
-    /*
-    private void startTimerIfNecessary() {
-      timeTick.removeCallbacks(timeRunnable);
-      if (isVisible() && !isInAmbientMode()) {
-        timeTick.post(timeRunnable);
-      }
     }
 
 
-    private final Runnable timeRunnable = new Runnable() {
-      @Override
-      public void run() {
-        onSecondTick();
-        if (isVisible() && !isInAmbientMode()) {
-          timeTick.postDelayed(this, TICK_PERIOD_MILLIS);
-        }
-      }
-    };
-
-
-    private void onSecondTick() {
-      invalidateIfNecessary();
-    }
-*/
-
     private void invalidateIfNecessary() {
       if (isVisible() && !isInAmbientMode()) {
         invalidate();
@@ -124,11 +93,7 @@ public void onGlContextCreated() {
     @Override
     public void onGlSurfaceCreated(int width, int height) {
       super.onGlSurfaceCreated(width, height);
-//      graphics.setSize(width, height);
-//      sketch.g.setSize(width, height);
-//      sketch.surfaceChanged();
-
-      sketch.displayHeight = width;
+      sketch.displayWidth = width;
       sketch.displayHeight = height;
       sketch.g.setSize(sketch.sketchWidth(), sketch.sketchHeight());
       sketch.surfaceChanged();

core/src/processing/core/PSurfaceAndroid2D.java

@@ -358,17 +358,13 @@ public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
         System.out.println("SketchSurfaceView2D.surfaceChanged() " + w + " " + h);
       }
 
-      sketch.displayHeight = w;
+      sketch.displayWidth = w;
       sketch.displayHeight = h;
       graphics.setSize(sketch.sketchWidth(), sketch.sketchHeight());
       sketch.surfaceChanged();
-
-//    width = w;
-//    height = h;
-//
-//    g.setSize(w, h);
     }
 
+
     @Override
     public void onWindowFocusChanged(boolean hasFocus) {
       super.onWindowFocusChanged(hasFocus);

core/src/processing/opengl/PSurfaceGLES.java

@@ -528,7 +528,7 @@ public void onSurfaceChanged(GL10 igl, int iwidth, int iheight) {
       // lib.init(iwidth, iheight);
 
        // Display width/height might change if the orientation changes.
-      sketch.displayHeight = iwidth;
+      sketch.displayWidth = iwidth;
       sketch.displayHeight = iheight;
       graphics.setSize(sketch.sketchWidth(), sketch.sketchHeight());
       sketch.surfaceChanged();