Revision: 3447
http://vexi.svn.sourceforge.net/vexi/?rev=3447&view=rev
Author: clrg
Date: 2009-03-25 10:59:16 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
Oops - copy&paste gone wrong + some clean up
Modified Paths:
--------------
trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp
trunk/core/org.vexi.core/src/org/vexi/core/Surface.java
Modified: trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp
===================================================================
--- trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp 2009-03-24 07:13:57 UTC
(rev 3446)
+++ trunk/core/org.vexi.core/src/org/vexi/core/Box.jpp 2009-03-25 10:59:16 UTC
(rev 3447)
@@ -134,7 +134,7 @@
private static final int TILE_IMAGE = 0x00000010;
private static final int MOUSEINSIDE = 0x00000020;
private static final int CURSOR = 0x00000040;
- private static final int LOCK_CHILDREN = 0x00000080;
+ //private static final int LOCK_CHILDREN = 0x00000080;
private static final int CONSTRAIN = 0x00000100;
private static final int CONSTRAIN_DESCENDENT = 0x00000200;
@@ -1096,7 +1096,7 @@
if (_event==null) _event = JSU.S('_'+JSU.toString(event));
if (inside(s_mx, s_my)) {
propagateEvent(event, _event, value, s_mx, s_my);
- } else if (forceOnRoot) {//eventString.startsWith("Release") ||
eventString.startsWith("Key")) {
+ } else if (forceOnRoot) {
if (Interpreter.CASCADE_PREVENTED == justTriggerTraps(_event,
value))
justTriggerTraps(event, value);
}
Modified: trunk/core/org.vexi.core/src/org/vexi/core/Surface.java
===================================================================
--- trunk/core/org.vexi.core/src/org/vexi/core/Surface.java 2009-03-24
07:13:57 UTC (rev 3446)
+++ trunk/core/org.vexi.core/src/org/vexi/core/Surface.java 2009-03-25
10:59:16 UTC (rev 3447)
@@ -175,7 +175,7 @@
if (button==1)
new Message(SC_Press1, SC__Press1, JSU.T);
else if (button==2)
- new Message(SC_Press1, SC__Press1, JSU.T);
+ new Message(SC_Press2, SC__Press2, JSU.T);
else new Message(JSU.S("Press"+button), JSU.S("_Press"+button),
JSU.T);
}
}
@@ -188,9 +188,9 @@
if (button==1)
new Message(SC_Release1, SC__Release1, JSU.T, true);
else if (button==2)
- new Message(SC_Release1, SC__Release1, JSU.T, true);
+ new Message(SC_Release2, SC__Release2, JSU.T, true);
else if (button==3)
- new Message(SC_Release1, SC__Release1, JSU.T, true);
+ new Message(SC_Release3, SC__Release3, JSU.T, true);
else new Message(JSU.S("Release"+button), JSU.S("_Release"+button),
JSU.T, true);
// invoke Click if platform requires it and release is sufficiently
close to release
if (Platform.needsAutoClick() && Math.abs(last_press_x - mousex) < 5
&& Math.abs(last_press_y - mousey) < 5)
@@ -203,9 +203,9 @@
if (button==1)
new Message(SC_Click1, SC__Click1, JSU.T);
else if (button==2)
- new Message(SC_Click1, SC__Click1, JSU.T);
+ new Message(SC_Click2, SC__Click2, JSU.T);
else if (button==3)
- new Message(SC_Click1, SC__Click1, JSU.T);
+ new Message(SC_Click3, SC__Click3, JSU.T);
else new Message(JSU.S("Click"+button), JSU.S("_Click"+button), JSU.T);
if (Platform.needsAutoDoubleClick()) {
long now = System.currentTimeMillis();
@@ -219,9 +219,9 @@
if (button==1)
new Message(SC_DoubleClick1, SC__DoubleClick1, JSU.T);
else if (button==2)
- new Message(SC_DoubleClick1, SC__DoubleClick1, JSU.T);
+ new Message(SC_DoubleClick2, SC__DoubleClick2, JSU.T);
else if (button==3)
- new Message(SC_DoubleClick1, SC__DoubleClick1, JSU.T);
+ new Message(SC_DoubleClick3, SC__DoubleClick3, JSU.T);
else new Message(JSU.S("DoubleClick"+button),
JSU.S("_DoubleClick"+button), JSU.T);
}
@@ -541,7 +541,7 @@
PixelBuffer buff = getPixelBuffer();
if (dirt!=null) {
- for(int i = 0; dirt != null && i < numregions; i++) {
+ for (int i = 0; dirt != null && i < numregions; i++) {
if (dirt[4*i]<0) continue;
int x = dirt[4*i], y = dirt[4*i+1], w = dirt[4*i+2], h =
dirt[4*i+3];
if (x < 0) x = 0;
@@ -560,7 +560,7 @@
// x,y,w,h is only partially reconstructed, so we must be
careful not to re-blit it
dirtyRegions.dirty(x, y, w, h);
// put back all the dirty regions we haven't yet processed
(including the current one)
- for(int j=i; j<numregions; j++)
+ for (int j=i; j<numregions; j++)
if (dirt[4*j]>=0)
dirtyRegions.dirty(dirt[4*j], dirt[4*j+1],
dirt[4*j+2], dirt[4*j+3]);
return;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
