From 187883563acedf8c0151caf3dedfd4b4eb37b557 Mon Sep 17 00:00:00 2001 From: Thomas Geymayer <tomgey@gmail.com> Date: Sat, 27 Jul 2013 00:32:26 +0200 Subject: [PATCH] Canvas GUI: update window for core change (size -> content-size). --- Nasal/canvas/gui.nas | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/Nasal/canvas/gui.nas b/Nasal/canvas/gui.nas index 294c5bb68..bab83e092 100644 --- a/Nasal/canvas/gui.nas +++ b/Nasal/canvas/gui.nas @@ -10,8 +10,8 @@ var Window = { _node: props.wrapNode(ghost._node_ghost) }; - m.setInt("size[0]", size[0]); - m.setInt("size[1]", size[1]); + m.setInt("content-size[0]", size[0]); + m.setInt("content-size[1]", size[1]); # TODO better default position m.move(0,0); @@ -51,8 +51,8 @@ var Window = { createCanvas: func() { var size = [ - me.get("size[0]"), - me.get("size[1]") + me.get("content-size[0]"), + me.get("content-size[1]") ]; me._canvas = new({ @@ -98,6 +98,11 @@ var Window = { me.setInt("tf/t[0]", x); me.setInt("tf/t[1]", y); }, + setSize: func(w, h) + { + me.set("content-size[0]", w); + me.set("content-size[1]", h); + }, move: func(x, y) { me.setInt("tf/t[0]", me.get("tf/t[0]", 10) + x); @@ -148,7 +153,7 @@ var Window = { ), setlistener ( - me._node.getNode("size[" ~ index ~ "]"), + me._node.getNode("content-size[" ~ index ~ "]"), func me._updatePos(index, name) ) ]; @@ -163,7 +168,7 @@ var Window = { "tf/t[" ~ index ~ "]", getprop("/sim/gui/canvas/size[" ~ index ~ "]") - me.get(name) - - me.get("size[" ~ index ~ "]") + - me.get("content-size[" ~ index ~ "]") ); }, _updateDecoration: func()