simplify screen placement when screen is too small (processing#3913)

benfry · benfry · commit d2ad755301a8 · 2015-10-23T15:27:29.000-04:00
diff --git a/build/shared/lib/defaults.txt b/build/shared/lib/defaults.txt
@@ -101,6 +101,8 @@ editor.window.height.min = 500
 editor.window.height.min.macosx = 450
 # tested to be 515 on Windows XP, this leaves some room
 editor.window.height.min.windows = 530
+# tested with Raspberry Pi display
+editor.window.height.min.linux = 480
 
 # font size for editor
 #editor.font = Monospaced,plain,12
diff --git a/core/src/processing/awt/PSurfaceAWT.java b/core/src/processing/awt/PSurfaceAWT.java
@@ -886,15 +886,19 @@ public void placeWindow(int[] location, int[] editorLocation) {
           // if it fits inside the editor window,
           // offset slightly from upper lefthand corner
           // so that it's plunked inside the text area
-          locationX = editorLocation[0] + 66;
-          locationY = editorLocation[1] + 66;
+          //locationX = editorLocation[0] + 66;
+          //locationY = editorLocation[1] + 66;
+          locationX = (sketch.displayWidth - window.width) / 2;
+          locationY = (sketch.displayHeight - window.height) / 2;
 
+          /*
           if ((locationX + window.width > sketch.displayWidth - 33) ||
             (locationY + window.height > sketch.displayHeight - 33)) {
             // otherwise center on screen
             locationX = (sketch.displayWidth - window.width) / 2;
             locationY = (sketch.displayHeight - window.height) / 2;
           }
+          */
           frame.setLocation(locationX, locationY);
         }
       } else {  // just center on screen
diff --git a/core/src/processing/javafx/PSurfaceFX.java b/core/src/processing/javafx/PSurfaceFX.java
@@ -466,6 +466,7 @@ public void placeWindow(int[] location, int[] editorLocation) {
         stage.setY(locationY);
 
       } else {  // doesn't fit
+        /*
         // if it fits inside the editor window,
         // offset slightly from upper lefthand corner
         // so that it's plunked inside the text area
@@ -475,9 +476,12 @@ public void placeWindow(int[] location, int[] editorLocation) {
         if ((locationX + stage.getWidth() > sketch.displayWidth - 33) ||
             (locationY + stage.getHeight() > sketch.displayHeight - 33)) {
           // otherwise center on screen
-          locationX = (int) ((sketch.displayWidth - stage.getWidth()) / 2);
-          locationY = (int) ((sketch.displayHeight - stage.getHeight()) / 2);
+        */
+        locationX = (int) ((sketch.displayWidth - stage.getWidth()) / 2);
+        locationY = (int) ((sketch.displayHeight - stage.getHeight()) / 2);
+        /*
         }
+        */
         stage.setX(locationX);
         stage.setY(locationY);
       }
@@ -951,4 +955,4 @@ private char getKeyChar(KeyEvent fxEvent) {
     if (ch.startsWith("\r")) return '\n'; // normalize enter key
     return ch.charAt(0);
   }
-}
+}
diff --git a/core/src/processing/opengl/PSurfaceJOGL.java b/core/src/processing/opengl/PSurfaceJOGL.java
@@ -540,6 +540,7 @@ public void placeWindow(int[] location, int[] editorLocation) {
         window.setTopLevelPosition(locationX - w, locationY);
 
       } else {  // doesn't fit
+        /*
         // if it fits inside the editor window,
         // offset slightly from upper lefthand corner
         // so that it's plunked inside the text area
@@ -549,9 +550,12 @@ public void placeWindow(int[] location, int[] editorLocation) {
         if ((locationX + w > sketch.displayWidth - 33) ||
             (locationY + h > sketch.displayHeight - 33)) {
           // otherwise center on screen
-          locationX = (sketch.displayWidth - w) / 2;
-          locationY = (sketch.displayHeight - h) / 2;
+        */
+        locationX = (sketch.displayWidth - w) / 2;
+        locationY = (sketch.displayHeight - h) / 2;
+        /*
         }
+        */
         window.setTopLevelPosition(locationX, locationY);
       }
     } else {  // just center on screen
diff --git a/core/todo.txt b/core/todo.txt
@@ -20,6 +20,10 @@ X Fix depth sorter ordering when two triangles in a plane share vertices
 X   https://github.com/processing/processing/pull/4010
 X Turn off fixed rate scheduling in OpenGL
 X   https://github.com/processing/processing/pull/4004
+X Fix GLSL preprocessing issues with variable name mangling
+X   https://github.com/processing/processing/pull/4052
+X   https://github.com/processing/processing/issues/3961
+X   https://github.com/processing/processing/issues/3968
 
 andres
 X cursor() fails to work as expected with P2D/P3D 
