You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by tv...@apache.org on 2009/12/04 20:57:48 UTC
svn commit: r887336 - in /incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk:
ApplicationContext.java DesktopApplicationContext.java
Author: tvolkert
Date: Fri Dec 4 19:57:48 2009
New Revision: 887336
URL: http://svn.apache.org/viewvc?rev=887336&view=rev
Log:
Fixed minor issues
Modified:
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java?rev=887336&r1=887335&r2=887336&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/ApplicationContext.java Fri Dec 4 19:57:48 2009
@@ -668,7 +668,7 @@
switch (event.getID()) {
case ComponentEvent.COMPONENT_RESIZED: {
if (scale == 1) {
- display.setSize(getWidth(), getHeight());
+ display.setSize(Math.max(getWidth(), 0), Math.max(getHeight(), 0));
} else {
display.setSize(Math.max((int)Math.ceil(getWidth() / scale), 0),
Math.max((int)Math.ceil(getHeight() / scale), 0));
Modified: incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java?rev=887336&r1=887335&r2=887336&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java (original)
+++ incubator/pivot/trunk/wtk/src/org/apache/pivot/wtk/DesktopApplicationContext.java Fri Dec 4 19:57:48 2009
@@ -354,22 +354,27 @@
String key = property[0];
String value = property[1];
- if (key.equals(X_ARGUMENT)) {
- x = Integer.parseInt(value);
- } else if (key.equals(Y_ARGUMENT)) {
- y = Integer.parseInt(value);
- } else if (key.equals(WIDTH_ARGUMENT)) {
- width = Integer.parseInt(value);
- } else if (key.equals(HEIGHT_ARGUMENT)) {
- height = Integer.parseInt(value);
- } else if (key.equals(CENTER_ARGUMENT)) {
- center = Boolean.parseBoolean(value);
- } else if (key.equals(RESIZABLE_ARGUMENT)) {
- resizable = Boolean.parseBoolean(value);
- } else if (key.equals(FULL_SCREEN_ARGUMENT)) {
- fullScreen = Boolean.parseBoolean(value);
- } else {
- properties.put(key, value);
+ try {
+ if (key.equals(X_ARGUMENT)) {
+ x = Integer.parseInt(value);
+ } else if (key.equals(Y_ARGUMENT)) {
+ y = Integer.parseInt(value);
+ } else if (key.equals(WIDTH_ARGUMENT)) {
+ width = Integer.parseInt(value);
+ } else if (key.equals(HEIGHT_ARGUMENT)) {
+ height = Integer.parseInt(value);
+ } else if (key.equals(CENTER_ARGUMENT)) {
+ center = Boolean.parseBoolean(value);
+ } else if (key.equals(RESIZABLE_ARGUMENT)) {
+ resizable = Boolean.parseBoolean(value);
+ } else if (key.equals(FULL_SCREEN_ARGUMENT)) {
+ fullScreen = Boolean.parseBoolean(value);
+ } else {
+ properties.put(key, value);
+ }
+ } catch (NumberFormatException exception) {
+ System.err.println("Warning: " + exception.getClass().getSimpleName() + ": " +
+ exception.getLocalizedMessage());
}
} else {
System.err.println(arg + " is not a valid startup property.");