fly/fgdata
1
0
Fork 0
Code Activity

Canvas bug fixes.

Browse source 
- show canvas in a window
 - create window decoration also during pause
 - update content of ScrollArea on resize
This commit is contained in:
Thomas Geymayer 2014-06-19 21:25:45 +02:00
parent 5d1184dd70
commit a2aafc3b51
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Nasal/canvas/gui.nas
View file

@ -143,8 +143,8 @@ var Window = {
# Set an existing canvas to be used for this Window
setCanvas: func(canvas_)
{
if( !isa(canvas_, canvas.Canvas) )
return debug.warn("Not a canvas.Canvas");
if( ghosttype(canvas_) != "Canvas" )
return debug.warn("Not a Canvas");
canvas_.addPlacement({type: "window", "id": me.get("id")});
me['_canvas'] = canvas_;
@ -210,6 +210,11 @@ var Window = {
{
me.set("content-size[0]", w);
me.set("content-size[1]", h);
if( me.onResize != nil )
me.onResize();
return me;
},
move: func(x, y)
{
@ -280,7 +285,7 @@ var Window = {
else if( name == "type" )
{
if( mode == 0 )
settimer(func me._updateDecoration(), 0);
settimer(func me._updateDecoration(), 0, 1);
}
else if( name.starts_with("resize-") )