Revision: 4326
http://vexi.svn.sourceforge.net/vexi/?rev=4326&view=rev
Author: clrg
Date: 2012-01-13 17:21:11 +0000 (Fri, 13 Jan 2012)
Log Message:
-----------
Comment out scar for now
Modified Paths:
--------------
trunk/org.vexi-core.main/src/main/java/org/vexi/core/Main.java
trunk/org.vexi-core.main/src/main/java/org/vexi/core/Surface.java
Modified: trunk/org.vexi-core.main/src/main/java/org/vexi/core/Main.java
===================================================================
--- trunk/org.vexi-core.main/src/main/java/org/vexi/core/Main.java
2012-01-13 17:17:29 UTC (rev 4325)
+++ trunk/org.vexi-core.main/src/main/java/org/vexi/core/Main.java
2012-01-13 17:21:11 UTC (rev 4326)
@@ -251,16 +251,16 @@
SCHEDULER = Platform.newScheduler();
SCHEDULER.incForceActive();
SCHEDULER.add(new Callable() {
- public Object run(Object o) throws Exception {
- org.vexi.core.Surface.scarImage =
Picture.load(scar, new Callable() {
+// public Object run(Object o) throws Exception {
+// org.vexi.core.Surface.scarImage =
Picture.load(scar, new Callable() {
public Object run(Object o) throws JSExn {
SCHEDULER.add(vexi);
SCHEDULER.decForceActive();
return null;
}
- });
- return null;
- }
+// });
+// return null;
+// }
});
SCHEDULER.run();
}
Modified: trunk/org.vexi-core.main/src/main/java/org/vexi/core/Surface.java
===================================================================
--- trunk/org.vexi-core.main/src/main/java/org/vexi/core/Surface.java
2012-01-13 17:17:29 UTC (rev 4325)
+++ trunk/org.vexi-core.main/src/main/java/org/vexi/core/Surface.java
2012-01-13 17:21:11 UTC (rev 4326)
@@ -197,7 +197,7 @@
// The scar image which is rendered over an unsigned Vexi Surface
// to let users know the application is not from a trusted source
- protected static Picture scarImage = null;
+// protected static Picture scarImage = null;
// Event Handling Helper methods for subclasses
///////////////////////////////////////////
@@ -795,14 +795,14 @@
abort = false;
abortcount ++;
// pending size update means the user resized the window
- if (pendingWidth != root.width || pendingHeight != root.height) {
- // ensure scar is always shown
- if (scarImage != null) {
- // dirty the place where the scar used to be and where it
is now
- dirty(0, root.height - scarImage.height, scarImage.width,
root.height);
- dirty(0, pendingHeight - scarImage.height,
scarImage.width, pendingHeight);
- }
- }
+// if (pendingWidth != root.width || pendingHeight != root.height) {
+// // ensure scar is always shown
+// if (scarImage != null) {
+// // dirty the place where the scar used to be and where
it is now
+// dirty(0, root.height - scarImage.height,
scarImage.width, root.height);
+// dirty(0, pendingHeight - scarImage.height,
scarImage.width, pendingHeight);
+// }
+// }
// reflow to new size as set by the frame
int cwidth = root.contentwidth;
int cheight = root.contentheight;
@@ -819,7 +819,7 @@
final PixelBuffer buf = _getPixelBuffer();
final int rwidth = root.width;
final int rheight = root.height;
- final int scar_y = rheight-scarImage.height;
+// final int scar_y = rheight-scarImage.height;
for (int i = 0; dirt != null && i < numregions; i++) {
// DirtyList indicates invalid dirty rects (4 consecutive
// ints in dirt) by marking the first coordinate -1
@@ -841,11 +841,11 @@
//System.out.println("render: "+x+","+y+" -> "+w+","+h);
root.render(0, 0, x, y, w, h, buf);
- if (scarImage != null) {
- if (scarImage.width > x && scar_y < h) {
- buf.drawPicture(scarImage, 0, scar_y, x, y, w, h);
- }
- }
+// if (scarImage != null) {
+// if (scarImage.width > x && scar_y < h) {
+// buf.drawPicture(scarImage, 0, scar_y, x, y, w, h);
+// }
+// }
if (abort) {
//System.out.println("abort");
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
RSA(R) Conference 2012
Mar 27 - Feb 2
Save $400 by Jan. 27
Register now!
http://p.sf.net/sfu/rsa-sfdev2dev2
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
