From a5401c19c7eb6ad005250f0b7c447b25c1603990 Mon Sep 17 00:00:00 2001
From: Thomas Geymayer <tomgey@gmail.com>
Date: Mon, 31 Mar 2014 13:34:50 +0200
Subject: [PATCH] canvas: update for new bounding box getters.

---
 Nasal/canvas/api.nas                    | 19 ++-----------------
 Nasal/canvas/gui/widgets/ScrollArea.nas |  2 +-
 2 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/Nasal/canvas/api.nas b/Nasal/canvas/api.nas
index 201f42877..11eac9105 100644
--- a/Nasal/canvas/api.nas
+++ b/Nasal/canvas/api.nas
@@ -245,27 +245,12 @@ var Element = {
   # @param color  Vector of 3 or 4 values in [0, 1]
   setColorFill: func me.set('fill', _getColor(arg)),
   #
-  getBoundingBox: func()
-  {
-    var bb = me._node.getNode("bounding-box");
-    if( bb != nil )
-    {
-      var min_x = bb.getNode("min-x").getValue();
-
-      if( min_x != nil )
-        return [ min_x,
-                  bb.getNode("min-y").getValue(),
-                  bb.getNode("max-x").getValue(),
-                  bb.getNode("max-y").getValue() ];
-    }
-
-    return [0, 0, 0, 0];
-  },
+  getTransformedBounds: func me.getTightBoundingBox(),
   # Calculate the transformation center based on bounding box and center-offset
   updateCenter: func
   {
     me.update();
-    var bb = me.getTransformedBounds();
+    var bb = me.getTightBoundingBox();
 
     if( bb[0] > bb[2] or bb[1] > bb[3] )
       return;
diff --git a/Nasal/canvas/gui/widgets/ScrollArea.nas b/Nasal/canvas/gui/widgets/ScrollArea.nas
index b39e12fc5..0819af0a7 100644
--- a/Nasal/canvas/gui/widgets/ScrollArea.nas
+++ b/Nasal/canvas/gui/widgets/ScrollArea.nas
@@ -44,7 +44,7 @@ gui.widgets.ScrollArea = {
   update: func()
   {
     # TODO only update on content resize
-    var bb = me.getContent().getTransformedBounds();
+    var bb = me.getContent().getTightBoundingBox();
 
     if( bb[2] < bb[0] or bb[3] < bb[1] )
       # Do nothing with invalid bounding box (probably no content yet)