+// FIXME
// Copyright 2002 Adam Megacz, see the COPYING file for licensing [GPL]
package org.xwt;
// as external events have occured, check the state of box
if (texture != null) {
if (texture.isLoaded) { minwidth = min(texture.width, maxwidth); minheight = min(texture.height, maxheight); }
- else { JS res = texture.res; texture = null; throw new JSExn("image not found: "+res); }
+ else { JS res = texture.stream; texture = null; throw new JSExn("image not found: "+res); }
}
MARK_REPACK;
if (x != this.x || y != this.y || width != this.width || height != this.height) {
boolean sizechange = (this.width != width || this.height != height) && getTrap("SizeChange") != null;
boolean poschange = (this.x != x || this.y != y) && getTrap("PosChange") != null;
- do {
+ //do {
int thisx = parent == null ? 0 : this.x;
int thisy = parent == null ? 0 : this.y;
(parent == null ? this : parent).dirty(thisx, thisy, this.width, this.height);
this.width = width; this.height = height; this.x = x; this.y = y;
dirty();
- } while (false);
- this.width = width; this.height = height; this.x = x; this.y = y;
+ //} while (false);
+ //this.width = width; this.height = height; this.x = x; this.y = y;
if (sizechange) putAndTriggerTrapsAndCatchExceptions("SizeChange", T);
if (poschange) putAndTriggerTrapsAndCatchExceptions("PosChange", T);
}
if (!child.test(PACKED)) {
child_x = child.x;
child_y = child.y;
- child_width = child.test(HSHRINK) ? child.contentwidth : min(child.maxwidth, width - child.x);
- child_height = child.test(VSHRINK) ? child.contentheight : min(child.maxheight, height - child.y);
+ child_width = child.test(HSHRINK) ? child.contentwidth : min(child.maxwidth, width - child_x);
+ child_height = child.test(VSHRINK) ? child.contentheight : min(child.maxheight, height - child_y);
child_width = max(child.minwidth, child_width);
child_height = max(child.minheight, child_height);
} else {
case "fill": return colorToString(fillcolor);
case "strokecolor": return colorToString(strokecolor);
case "textcolor": return colorToString(strokecolor);
- case "font": return font == null ? null : font.res;
+ case "font": return font == null ? null : font.stream;
case "fontsize": return font == null ? N(10) : N(font.pointsize);
case "strokewidth": return N(strokewidth);
case "align": return alignToString();
font = value == null ? null : Font.getFont((Stream)value, font == null ? 10 : font.pointsize);
MARK_RESIZE;
dirty();
- case "fontsize": font = Font.getFont(font == null ? null : font.res, toInt(value)); MARK_RESIZE; dirty();
- case "x": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(x); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty(); }
- case "y": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(y); } else { if (test(PACKED) && parent != null) return; CHECKSET_INT(y); dirty(); MARK_RESIZE; dirty(); }
+ case "fontsize": font = Font.getFont(font == null ? null : font.stream, toInt(value)); MARK_RESIZE; dirty();
+ case "x": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(x); } else { if (test(PACKED) && parent != null) return; dirty(); CHECKSET_INT(x); dirty(); MARK_RESIZE; dirty(); }
+ case "y": if (parent==null && Surface.fromBox(this)!=null) { CHECKSET_INT(y); } else { if (test(PACKED) && parent != null) return; dirty(); CHECKSET_INT(y); dirty(); MARK_RESIZE; dirty(); }
case "titlebar":
if (getSurface() != null && value != null) getSurface().setTitleBarText(JS.toString(value));
super.put(name,value);
if (i < 0) return;
if (value != null && !(value instanceof Box)) {
- if (Log.on) JS.log(this, "attempt to set a numerical property on a box to a non-box");
+ if (Log.on) JS.warn("attempt to set a numerical property on a box to a non-box");
return;
}
if (redirect == null) {
if (value == null) putAndTriggerTrapsAndCatchExceptions("childremoved", getChild(i));
- else JS.log(this, "attempt to add/remove children to/from a node with a null redirect");
+ else JS.warn("attempt to add/remove children to/from a node with a null redirect");
} else if (redirect != this) {
if (value != null) putAndTriggerTrapsAndCatchExceptions("childadded", value);
// check if box being moved is currently target of a redirect
for(Box cur = b.parent; cur != null; cur = cur.parent)
if (cur.redirect == b) {
- if (Log.on) JS.log(this, "attempt to move a box that is the target of a redirect");
+ if (Log.on) JS.warn("attempt to move a box that is the target of a redirect");
return;
}
// check for recursive ancestor violation
for(Box cur = this; cur != null; cur = cur.parent)
if (cur == b) {
- if (Log.on) JS.log(this, "attempt to make a node a parent of its own ancestor");
+ if (Log.on) JS.warn("attempt to make a node a parent of its own ancestor");
if (Log.on) Log.info(this, "box == " + this + " ancestor == " + b);
return;
}