You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2009/04/08 17:13:18 UTC
svn commit: r763276 - in /incubator/pivot/trunk:
tutorials/src/pivot/tutorials/ wtk/src/pivot/wtk/media/drawing/
Author: gbrown
Date: Wed Apr 8 15:13:18 2009
New Revision: 763276
URL: http://svn.apache.org/viewvc?rev=763276&view=rev
Log:
Expand button rollup in Kitchen Sink demo in a callback; comment out example code that re-loads default theme since it had a performance impact; continue to stub out drawing APIs.
Removed:
incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Clone.java
Modified:
incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java
incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Ellipse.java
incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Group.java
incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Polygon.java
incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Rectangle.java
incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java
incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Text.java
Modified: incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java?rev=763276&r1=763275&r2=763276&view=diff
==============================================================================
--- incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java (original)
+++ incubator/pivot/trunk/tutorials/src/pivot/tutorials/Demo.java Wed Apr 8 15:13:18 2009
@@ -63,7 +63,7 @@
import pivot.wtk.TableView;
import pivot.wtk.TableViewHeader;
import pivot.wtk.TextArea;
-import pivot.wtk.Theme;
+// import pivot.wtk.Theme;
import pivot.wtk.TreeView;
import pivot.wtk.Visual;
import pivot.wtk.Window;
@@ -76,7 +76,7 @@
import pivot.wtk.effects.ReflectionDecorator;
import pivot.wtk.effects.WatermarkDecorator;
import pivot.wtk.media.Image;
-import pivot.wtk.skin.terra.TerraTheme;
+// import pivot.wtk.skin.terra.TerraTheme;
import pivot.wtk.text.Document;
import pivot.wtk.text.PlainTextSerializer;
import pivot.wtkx.WTKXSerializer;
@@ -143,14 +143,18 @@
@SuppressWarnings("unchecked")
public void startup(final Display display, Dictionary<String, String> properties) throws Exception {
+ // NOTE This is commented out because it takes a non-negligible amount
+ // of time to execute
+ /*
TerraTheme terraTheme = (TerraTheme)Theme.getTheme();
URL schemeLocation = TerraTheme.class.getResource("TerraTheme_default.json");
terraTheme.loadScheme(schemeLocation);
+ */
WTKXSerializer wtkxSerializer = new WTKXSerializer();
Component content = (Component)wtkxSerializer.readObject("pivot/tutorials/demo.wtkx");
- Rollup buttonsRollup = (Rollup)wtkxSerializer.getObjectByName("buttonsRollup");
+ final Rollup buttonsRollup = (Rollup)wtkxSerializer.getObjectByName("buttonsRollup");
buttonsRollup.getRollupListeners().add(new RollupHandler("pivot/tutorials/buttons.wtkx") {
@Override
protected void initialize(WTKXSerializer wtkxSerializer) {
@@ -158,8 +162,6 @@
}
});
- buttonsRollup.setExpanded(true);
-
Rollup listsRollup = (Rollup)wtkxSerializer.getObjectByName("listsRollup");
listsRollup.getRollupListeners().add(new RollupHandler("pivot/tutorials/lists.wtkx") {
@Override
@@ -499,6 +501,12 @@
window.setContent(content);
window.open(display);
+
+ ApplicationContext.scheduleCallback(new Runnable() {
+ public void run() {
+ buttonsRollup.setExpanded(true);
+ }
+ }, 0);
}
@SuppressWarnings("unchecked")
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Ellipse.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Ellipse.java?rev=763276&r1=763275&r2=763276&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Ellipse.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Ellipse.java Wed Apr 8 15:13:18 2009
@@ -19,26 +19,13 @@
import java.awt.Graphics2D;
public class Ellipse extends Shape {
-
@Override
public boolean contains(int x, int y) {
// TODO Auto-generated method stub
return false;
}
- public int getHeight() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public int getWidth() {
- // TODO Auto-generated method stub
- return 0;
- }
-
public void paint(Graphics2D graphics) {
// TODO Auto-generated method stub
-
}
-
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Group.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Group.java?rev=763276&r1=763275&r2=763276&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Group.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Group.java Wed Apr 8 15:13:18 2009
@@ -18,10 +18,10 @@
import java.awt.Graphics2D;
import java.util.Iterator;
-
import pivot.collections.ArrayList;
import pivot.collections.Sequence;
import pivot.util.ImmutableIterator;
+import pivot.wtk.Bounds;
/**
* Shape representing a collection of other shapes.
@@ -119,4 +119,20 @@
public Iterator<Shape> iterator() {
return new ImmutableIterator<Shape>(shapes.iterator());
}
+
+ protected void invalidateRegion(Shape shape) {
+ invalidateRegion(shape.getBounds());
+ }
+
+ protected void invalidateRegion(Bounds bounds) {
+ invalidateRegion(bounds.x, bounds.y, bounds.width, bounds.height);
+ }
+
+ protected void invalidateRegion(int x, int y, int width, int height) {
+ // TODO
+ }
+
+ protected void invalidateBounds(Shape shape) {
+ // TODO
+ }
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Polygon.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Polygon.java?rev=763276&r1=763275&r2=763276&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Polygon.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Polygon.java Wed Apr 8 15:13:18 2009
@@ -19,26 +19,13 @@
import java.awt.Graphics2D;
public class Polygon extends Shape {
-
@Override
public boolean contains(int x, int y) {
// TODO Auto-generated method stub
return false;
}
- public int getHeight() {
- // TODO Auto-generated method stub
- return 0;
- }
-
- public int getWidth() {
- // TODO Auto-generated method stub
- return 0;
- }
-
public void paint(Graphics2D graphics) {
// TODO Auto-generated method stub
-
}
-
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Rectangle.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Rectangle.java?rev=763276&r1=763275&r2=763276&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Rectangle.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Rectangle.java Wed Apr 8 15:13:18 2009
@@ -18,65 +18,19 @@
import java.awt.Graphics2D;
-import pivot.wtk.Dimensions;
-
/**
* Shape representing a rectangle.
*
* @author gbrown
*/
public class Rectangle extends Shape {
- private int width = 0;
- private int height = 0;
-
- public int getWidth() {
- return width;
- }
-
- public void setWidth(int width) {
- if (width < 0) {
- throw new IllegalArgumentException("width is null.");
- }
-
- this.width = width;
- }
-
- public int getHeight() {
- return height;
- }
-
- public void setHeight(int height) {
- if (height < 0) {
- throw new IllegalArgumentException("height is null.");
- }
-
- this.height = height;
- }
-
- public Dimensions getSize() {
- return new Dimensions(getWidth(), getHeight());
- }
-
- public void setSize(int width, int height) {
- setWidth(width);
- setHeight(height);
- }
-
- public void setSize(Dimensions size) {
- if (size == null) {
- throw new IllegalArgumentException("size is null.");
- }
-
- setSize(size.width, size.height);
- }
-
- public void paint(Graphics2D graphics) {
- // TODO
- }
-
@Override
public boolean contains(int x, int y) {
// TODO
return false;
}
+
+ public void paint(Graphics2D graphics) {
+ // TODO
+ }
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java?rev=763276&r1=763275&r2=763276&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Shape.java Wed Apr 8 15:13:18 2009
@@ -34,6 +34,8 @@
private int x = 0;
private int y = 0;
+ private int width = 0;
+ private int height = 0;
private Paint fill = null;
private Paint stroke = Color.BLACK;
@@ -86,7 +88,25 @@
setOrigin(origin.x, origin.y);
}
+ public int getWidth() {
+ return width;
+ }
+
+ public int getHeight() {
+ return height;
+ }
+
+ protected void setSize(int width, int height) {
+ // TODO
+ this.width = width;
+ this.height = height;
+ }
+
public Bounds getBounds() {
+ return getBounds(true);
+ }
+
+ protected Bounds getBounds(boolean validate) {
// TODO Transform untransformed bounds
return null;
}
@@ -188,4 +208,16 @@
// TODO
return null;
}
+
+ protected void invalidateRegion() {
+ if (parent != null) {
+ parent.invalidateRegion(this);
+ }
+ }
+
+ protected void invalidateBounds() {
+ if (parent != null) {
+ parent.invalidateBounds(this);
+ }
+ }
}
Modified: incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Text.java
URL: http://svn.apache.org/viewvc/incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Text.java?rev=763276&r1=763275&r2=763276&view=diff
==============================================================================
--- incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Text.java (original)
+++ incubator/pivot/trunk/wtk/src/pivot/wtk/media/drawing/Text.java Wed Apr 8 15:13:18 2009
@@ -60,23 +60,13 @@
this.wrapWidth = wrapWidth;
}
- public int getWidth() {
- // TODO
- return 0;
- }
-
- public int getHeight() {
+ @Override
+ public boolean contains(int x, int y) {
// TODO
- return 0;
+ return false;
}
public void paint(Graphics2D graphics) {
// TODO
}
-
- @Override
- public boolean contains(int x, int y) {
- // TODO
- return false;
- }
}