eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-12 10:00:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

cleaning up window placement problems

Browse Source
This commit is contained in:
benfry
2008-11-24 01:33:19 +00:00
parent a59ac8735b
commit bf4d2fa8b8
2 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
app/src/processing/app/Base.java
View File

@@ -470,30 +470,48 @@ public class Base {
protected int[] nextEditorLocation() {
int[] location;
Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
int defaultWidth = Preferences.getInteger("default.window.width");
int defaultHeight = Preferences.getInteger("default.window.height");
if (activeEditor == null) {
// If no current active editor, use default placement
location = new int[5];
// Get default window width and height
location[2] = Preferences.getInteger("default.window.width");
location[3] = Preferences.getInteger("default.window.height");
Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
location[0] = (screen.width - location[2]) / 2;
location[1] = (screen.height - location[3]) / 2;
return new int[] {
(screen.width - defaultWidth) / 2,
(screen.height - defaultHeight) / 2,
defaultWidth, defaultHeight, 0
};
} else {
// With a currently active editor, open the new window
// using the same dimensions, but offset slightly.
location = activeEditor.getPlacement();
location[0] += 50;
location[1] += 50;
}
return location;
}
synchronized (editors) {
final int OVER = 50;
// In release 0160, don't
//location = activeEditor.getPlacement();
Editor lastOpened = editors.get(editors.size() - 1);
int[] location = lastOpened.getPlacement();
// Just in case the bounds for that window are bad
location[0] += OVER;
location[1] += OVER;
if (location[0] == OVER ||
location[2] == OVER ||
location[0] + location[2] > screen.width ||
location[1] + location[3] > screen.height) {
// Warp the next window to a randomish location on screen.
return new int[] {
(int) (Math.random() * (screen.width - defaultWidth)),
(int) (Math.random() * (screen.height - defaultHeight)),
defaultWidth, defaultHeight, 0
};
}
return location;
}
}
}
// .................................................................
@@ -522,6 +540,7 @@ public class Base {
String purty = formatter.format(new Date()).toLowerCase();
do {
if (index == 26) {
// In 0159, avoid running past z by sending people outdoors.
if (!breakTime) {
Base.showWarning("Time for a Break",
"You've reached the limit for auto naming of new sketches\n" +

21
app/src/processing/app/Sketch.java
View File

@@ -2135,26 +2135,6 @@ public class Sketch {
}
}
/*
String exportPlatformStr = null;
if (exportPlatform == PConstants.WINDOWS) {
exportPlatformStr = "windows";
} else if (exportPlatform == PConstants.MACOSX) {
exportPlatformStr = "macosx";
} else if (exportPlatform == PConstants.LINUX) {
exportPlatformStr = "linux";
} else {
exportPlatform = -1;
}
String folderName = "application";
if (exportPlatform != -1) {
folderName += "." + exportPlatformStr;
}
// nuke the old folder because it can cause trouble
File destFolder = new File(folder, folderName);
*/
File destFolder = new File(destPath);
if (Preferences.getBoolean("export.delete_target_folder")) {
Base.removeDir(destFolder);
@@ -2330,6 +2310,7 @@ public class Sketch {
// a list of the files that should be exported.
// otherwise, all files are exported.
for (File libraryFolder : importedLibraries) {
//System.out.println(libraryFolder + " " + libraryFolder.getAbsolutePath());
// in the list is a File object that points the
// library sketch's "library" folder
File exportSettings = new File(libraryFolder, "export.txt");