From: Thomas Geymayer <tomgey@gmail.com>
Date: Thu, 14 Feb 2013 16:32:19 +0000 (+0100)
Subject: CanvasImage: Use normalized coordinates by default.
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a63ec83d5fe6a859b0dbfd636bcc66a0ca6f18f9;p=simgear.git

CanvasImage: Use normalized coordinates by default.

Using absolute sizes by default lead to problems,
as while creating the image the size of the later
texture is not available.
---

diff --git a/simgear/canvas/elements/CanvasImage.cxx b/simgear/canvas/elements/CanvasImage.cxx
index cf9f12f2..c41c4897 100644
--- a/simgear/canvas/elements/CanvasImage.cxx
+++ b/simgear/canvas/elements/CanvasImage.cxx
@@ -319,17 +319,10 @@ namespace canvas
   {
     if( !_src_rect.width() || !_src_rect.height() )
     {
-      const SGRect<int>& tex_dim = getTextureDimensions();
-
-      _node_src_rect->setBoolValue("normalized", false);
-      _node_src_rect->setFloatValue("right", tex_dim.width());
-      _node_src_rect->setFloatValue("bottom", tex_dim.height());
-    }
-
-    if( !_region.width() || !_region.height() )
-    {
-      _node->setFloatValue("size[0]", _src_rect.width());
-      _node->setFloatValue("size[1]", _src_rect.height());
+      // Show whole image by default
+      _node_src_rect->setBoolValue("normalized", true);
+      _node_src_rect->setFloatValue("right", 1);
+      _node_src_rect->setFloatValue("bottom", 1);
     }
   }