Merge lp:~nux-team/nux/nux.attempt-to-fix-widgets-new into lp:nux

[Eleni Maria Stea]

changed nux widgets to use relative coord system
related unity branch: https://code.launchpad.net/~unity-team/unity/unity.attempt-to-fix-widgets
needs testing :)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:717
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~nux-team/nux/nux.attempt-to-fix-widgets-new/+merge/140232/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/nux-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-raring-amd64-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-raring-armhf-ci/3/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/nux-raring-i386-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/nux-ci/3/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

717. By Eleni Maria Stea on 2012-12-13

local merge

716. By Eleni Maria Stea on 2012-11-22

added jay's fix for GroupBox2 from this branch:
http://bazaar.launchpad.net/~unity-team/nux/nux.rebase-area-xy-rgbvaluator/revision/704#Nux/ClientArea.cpp

715. By Eleni Maria Stea on 2012-11-21

!!work in progress!! the menu contents now appear but there are
still issues with the menupage position

714. By Eleni Maria Stea on 2012-11-20

Paint2DQuadColor function finally calls a fragment
shader that needs the absolute pixel position therefore
we use absolute geometry

713. By Eleni Maria Stea on 2012-11-20

text rendering in tabview needs
absolute geometry :->

712. By Eleni Maria Stea on 2012-11-19

reverted the events geometry

711. By Eleni Maria Stea on 2012-11-19

fixed tabview geometry (work in progress)

710. By Eleni Maria Stea on 2012-11-19

fixed groupbox2 layout geometry

709. By Eleni Maria Stea on 2012-11-19

Fixed captions of GroupBox2

708. By Eleni Maria Stea on 2012-11-16

removed comment

=== modified file 'Nux/AbstractCheckedButton.cpp'
--- Nux/AbstractCheckedButton.cpp	2012-11-05 21:31:06 +0000
+++ Nux/AbstractCheckedButton.cpp	2012-12-17 15:42:23 +0000
@@ -28,7 +28,7 @@
 namespace nux
 {
   NUX_IMPLEMENT_OBJECT_TYPE(AbstractCheckedButton);
-  
+
   AbstractCheckedButton::AbstractCheckedButton(const std::string &str, bool state, NUX_FILE_LINE_DECL)
     : AbstractButton(NUX_FILE_LINE_PARAM)
   {
@@ -86,7 +86,7 @@
 
   void AbstractCheckedButton::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     graphics_engine.PushClippingRectangle(base);
 
     GetPainter().PaintBackground(graphics_engine, base);
@@ -110,7 +110,7 @@
 
     GetPainter().PushPaintLayerStack();
     {
-      GetPainter().PaintCheckBox(graphics_engine, check_area_->GetGeometry(), is, Color(0xff000000));
+      GetPainter().PaintCheckBox(graphics_engine, check_area_->GetGeometryRelativeTo(this), is, Color(0xff000000));
       static_text_->ProcessDraw(graphics_engine, true);
     }
     GetPainter().PopPaintLayerStack();
@@ -138,9 +138,9 @@
 
       {
         // Check if the text view goes out of the AbstractCheckedButton area.
-        Geometry base = GetGeometry();
-        Geometry text_geo = static_text_->GetGeometry();
- 
+        Geometry base = GetNativeGeometry();
+        Geometry text_geo = static_text_->GetGeometryRelativeTo(this);
+
         // Intersect the AbstractCheckedButton and the text view
         Geometry intersection = base.Intersect(text_geo);
         if (intersection != text_geo)
 
=== modified file 'Nux/AbstractCheckedButton.h'
--- Nux/AbstractCheckedButton.h	2011-10-18 20:00:59 +0000
+++ Nux/AbstractCheckedButton.h	2012-12-17 15:42:23 +0000
@@ -89,7 +89,7 @@
     virtual long ComputeContentSize();
 
     HLayout   *hlayout_;
-    InputArea *check_area_;
+    BasicView *check_area_;
 
   private:
     //! Override of Area::SetMinimumHeight and made private.
 
=== modified file 'Nux/AnimatedTextureArea.cpp'
--- Nux/AnimatedTextureArea.cpp	2012-10-02 07:32:55 +0000
+++ Nux/AnimatedTextureArea.cpp	2012-12-17 15:42:23 +0000
@@ -52,9 +52,9 @@
   {
     if (m_UserTexture)
     {
-      GetPainter().PaintBackground(graphics_engine, GetGeometry());
+      GetPainter().PaintBackground(graphics_engine, GetNativeGeometry());
       graphics_engine.GetRenderStates().SetBlend(true, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-      nux::Geometry base = GetGeometry();
+      nux::Geometry base = GetNativeGeometry();
       nux::TexCoordXForm texxform;
       graphics_engine.QRP_1Tex(base.x, base.y, base.width, base.height, m_UserTexture->GetDeviceTexture(), texxform, nux::color::White);
 
 
=== modified file 'Nux/Area.cpp'
--- Nux/Area.cpp	2012-11-12 20:59:56 +0000
+++ Nux/Area.cpp	2012-12-17 15:42:23 +0000
@@ -347,6 +347,16 @@
     return GetY();
   }
 
+  int Area::GetNativeX() const
+  {
+    return 0;
+  }
+
+  int Area::GetNativeY() const
+  {
+    return 0;
+  }
+
   int Area::GetWidth() const
   {
     return geometry_.width;
@@ -409,6 +419,53 @@
     return geometry_;
   }
 
+  Geometry Area::GetNativeGeometry() const
+  {
+    return Geometry(0, 0, geometry_.width, geometry_.height);
+  }
+
+  Geometry Area::GetInnerGeometryRelativeTo(Area* area, Geometry& geo) const
+  {
+    Area* parent = GetParentObject();
+    if (parent == area)
+    {
+      return geo;
+    }
+    else if (parent != NULL)
+    {
+      geo.OffsetPosition(parent->GetX(), parent->GetY());
+      return parent->GetInnerGeometryRelativeTo(area, geo);
+    }
+    else
+    {
+      //parent is NULL
+      return Geometry (0, 0, 0, 0);
+    }
+  }
+
+  Geometry Area::GetGeometryRelativeTo(Area* area) const
+  {
+    if (this == area)
+      return GetNativeGeometry();
+
+    Geometry geo = GetGeometry();
+    Area* parent = GetParentObject();
+    if (parent == area)
+    {
+      return geo;
+    }
+    else if (parent != NULL)
+    {
+      geo.OffsetPosition(parent->GetX(), parent->GetY());
+      return parent->GetInnerGeometryRelativeTo(area, geo);
+    }
+    else
+    {
+      //parent is NULL
+      return Geometry (0, 0, 0, 0);
+    }
+  }
+
   void Area::SetX(int x)
   {
     SetGeometry(x, geometry_.y, geometry_.width, geometry_.height);
@@ -756,7 +813,7 @@
     return _3d_area;
   }
 
-  static void MatrixXFormGeometry(const Matrix4 &matrix, Geometry &geo)
+  static void MatrixXFormGeometry(const Matrix4& matrix, Geometry& geo)
   {
     Vector4 in(geo.x, geo.y, 0, 1);
     // This is mean only for translation matrices. It will not work with matrices containing rotations or scalings.
@@ -765,7 +822,7 @@
     geo.y = out.y;
   }
 
-  void Area::InnerGetAbsoluteGeometry(Geometry &geometry)
+  void Area::InnerGetAbsoluteGeometry(Geometry& geometry)
   {
     if (this->Type().IsDerivedFromType(BaseWindow::StaticObjectType) || (this == window_thread_->GetLayout()))
     {
@@ -775,9 +832,12 @@
 
     MatrixXFormGeometry(_2d_xform, geometry);
 
-    Area *parent = GetParentObject();
+    Area* parent = GetParentObject();
     if (parent)
+    {
+      geometry.OffsetPosition(parent->GetX(), parent->GetY());
       parent->InnerGetAbsoluteGeometry(geometry);
+    }
   }
 
   Geometry Area::GetAbsoluteGeometry() const
@@ -798,7 +858,10 @@
 
       Area *parent = GetParentObject();
       if (parent)
+      {
+        geo.OffsetPosition(parent->GetX(), parent->GetY());
         parent->InnerGetAbsoluteGeometry(geo);
+      }
 
       return geo;
     }
@@ -824,16 +887,19 @@
     return GetAbsoluteGeometry().height;
   }
 
-  void Area::InnerGetRootGeometry(Geometry &geometry)
+  void Area::InnerGetRootGeometry(Geometry& geometry)
   {
     if (this->Type().IsDerivedFromType(BaseWindow::StaticObjectType) || (this == window_thread_->GetLayout()))
       return;
 
     MatrixXFormGeometry(_2d_xform, geometry);
 
-    Area *parent = GetParentObject();
+    Area* parent = GetParentObject();
     if (parent)
+    {
+      geometry.OffsetPosition(parent->GetX(), parent->GetY());
       parent->InnerGetRootGeometry(geometry);
+    }
   }
 
   Geometry Area::GetRootGeometry() const
@@ -847,9 +913,12 @@
     }
     else
     {
-      Area *parent = GetParentObject();
+      Area* parent = GetParentObject();
       if (parent)
+      {
+        geo.OffsetPosition(parent->GetX(), parent->GetY());
         parent->InnerGetRootGeometry(geo);
+      }
 
       return geo;
     }
@@ -922,7 +991,7 @@
     if (!parent || !parent_area_)
       return false;
 
-    return parent_area_->IsChildOf(parent);    
+    return parent_area_->IsChildOf(parent);
   }
 
   void Area::QueueRelayout()
@@ -1143,7 +1212,7 @@
     }
   }
 
-  bool Area::RedirectRenderingToTexture() const
+  bool Area::GetRedirectRenderingToTexture() const
   {
     return redirect_rendering_to_texture_;
   }
@@ -1155,7 +1224,7 @@
 
   ObjectPtr<IOpenGLBaseTexture> Area::BackupTexture() const
   {
-    // if RedirectRenderingToTexture() is false, then backup_texture_ is not a valid smart pointer.
+    // if GetRedirectRenderingToTexture() is false, then backup_texture_ is not a valid smart pointer.
     return backup_texture_;
   }
 
@@ -1170,12 +1239,12 @@
 
     while (parent)
     {
-      if (parent->RedirectRenderingToTexture() && (parent->UpdateBackupTextureForChildRendering() == false))
+      if (parent->GetRedirectRenderingToTexture() && (parent->UpdateBackupTextureForChildRendering() == false))
       {
         parent->SetUpdateBackupTextureForChildRendering(true);
         parent->PrepareParentRedirectedView();
       }
-      else if (parent->RedirectRenderingToTexture() && (parent->UpdateBackupTextureForChildRendering() == true))
+      else if (parent->GetRedirectRenderingToTexture() && (parent->UpdateBackupTextureForChildRendering() == true))
       {
         break;
       }
@@ -1199,7 +1268,7 @@
     if (parent)
     {
       View* view = static_cast<View*>(parent);
-      if (view->RedirectRenderingToTexture())
+      if (view->GetRedirectRenderingToTexture())
       {
         return true;
       }
@@ -1217,7 +1286,7 @@
 
     while (parent)
     {
-      if (parent->RedirectRenderingToTexture())
+      if (parent->GetRedirectRenderingToTexture())
       {
         return parent;
       }
@@ -1237,7 +1306,7 @@
     present_redirected_view_ = present_redirected_view;
   }
 
-  bool Area::PresentRedirectedView() const
+  bool Area::GetPresentRedirectedView() const
   {
     return present_redirected_view_;
   }
 
=== modified file 'Nux/Area.h'
--- Nux/Area.h	2012-11-12 20:59:56 +0000
+++ Nux/Area.h	2012-12-17 15:42:23 +0000
@@ -162,6 +162,8 @@
     int GetY() const;
     int GetWidth() const;
     int GetHeight() const;
+    int GetNativeX() const;
+    int GetNativeY() const;
 
     void SetX(int x);
     void SetY(int y);
@@ -217,6 +219,17 @@
     */
     Geometry const& GetGeometry() const;
 
+    //! Get the native geometry of the object.
+    /*!
+        The native geometry of an area is its geometry as if its top left corner where the origine
+        of the coordinate system. That is, for a native geometry, the value of x and y is 0.
+        @return The native geometry of the object, with 0 as the value for x and y.
+        @sa GetBaseWidth(), GetBaseHeight(), GetBaseX(), GetBaseY().
+    */
+    Geometry GetNativeGeometry() const;
+
+    Geometry GetGeometryRelativeTo(Area* area) const;
+
     //! Set the geometry of the object.
     /*!
         Set the width, height, and x, y position of the object on the screen.
@@ -632,6 +645,8 @@
     //! Return the absolute geometry starting with a relative geometry passed as argument.
     void InnerGetRootGeometry(Geometry &geometry);
 
+    Geometry GetInnerGeometryRelativeTo(Area* area, Geometry& geo) const;
+
     bool on_geometry_change_reconfigure_parent_layout_;
 
     //! If this variable is true, then this area has the keyboard focus.
@@ -666,12 +681,12 @@
     /*!
         @return True if the rendering of this view is done in a texture.
     */
-    virtual bool RedirectRenderingToTexture() const;
+    virtual bool GetRedirectRenderingToTexture() const;
 
-    //! Return the texture of this View if RedirectRenderingToTexture is enabled.
+    //! Return the texture of this View if GetRedirectRenderingToTexture is enabled.
     /*
-        Return the texture of this View if RedirectRenderingToTexture is enabled.
-        If RedirectRenderingToTexture() is false, then backup_texture_ is not a valid smart pointer.
+        Return the texture of this View if GetRedirectRenderingToTexture is enabled.
+        If GetRedirectRenderingToTexture() is false, then backup_texture_ is not a valid smart pointer.
 
         @return the device texture that contains the rendering of this view.
     */
@@ -691,7 +706,7 @@
     /*!
         @return True if the redirected texture is displayed in the rendering tree.
     */
-    bool PresentRedirectedView() const;
+    bool GetPresentRedirectedView() const;
 
 protected:
     //! Redirect the rendering of the view to a texture.
@@ -720,6 +735,11 @@
     */
     virtual void PrepareParentRedirectedView();
 
+    /*!
+        Gather all redirected views that are child of this, for rendering.
+    */
+    virtual void GatherRedirectedViewForRendering(GraphicsEngine& /*graphics_engine*/){};
+
     virtual bool HasParentRedirectedView();
     Area* RedirectedAncestor();
 
 
=== modified file 'Nux/BaseWindow.cpp'
--- Nux/BaseWindow.cpp	2012-10-18 10:23:45 +0000
+++ Nux/BaseWindow.cpp	2012-12-17 15:42:23 +0000
@@ -112,7 +112,7 @@
 
   void BaseWindow::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     // The elements position inside the window are referenced to top-left window corner. So bring base to(0, 0).
     base.SetX(0);
     base.SetY(0);
@@ -127,7 +127,7 @@
   void BaseWindow::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
   {
 
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     // The elements position inside the window are referenced to top-left window corner. So bring base to(0, 0).
     base.SetX(0);
     base.SetY(0);
@@ -162,7 +162,7 @@
       return false;
 
     m_layout = layout;
-    Geometry geo = GetGeometry();
+    Geometry geo = GetNativeGeometry();
     Geometry layout_geo = Geometry(geo.x + m_Border, geo.y + m_TopBorder,
                                     geo.GetWidth() - 2 * m_Border, geo.GetHeight() - m_Border - m_TopBorder);
     m_layout->SetGeometry(layout_geo);
@@ -179,7 +179,7 @@
   // Here we need to position the header by hand because it is not under the control of vlayout.
   void BaseWindow::PreLayoutManagement()
   {
-    Geometry geo = GetGeometry();
+    Geometry geo = GetNativeGeometry();
 
     if (m_configure_notify_callback)
     {
@@ -188,13 +188,13 @@
       if (geo.IsNull())
       {
         nuxDebugMsg("[BaseWindow::PreLayoutManagement] Received an invalid Geometry.");
-        geo = GetGeometry();
+        geo = GetNativeGeometry();
       }
       else
       {
         Area::SetGeometry(geo);
         // Get the geometry adjusted with respect to min and max dimension of this area.
-        geo = GetGeometry();
+        geo = GetNativeGeometry();
       }
     }
 
@@ -216,10 +216,10 @@
   {
     if (IsSizeMatchContent() && m_layout)
     {
-      Geometry layout_geometry = m_layout->GetGeometry();
+      Geometry layout_geometry = m_layout->GetNativeGeometry();
 
-      Geometry WindowGeometry = Geometry(GetGeometry().x,
-                                          GetGeometry().y,
+      Geometry WindowGeometry = Geometry(GetNativeGeometry().x,
+                                          GetNativeGeometry().y,
                                           layout_geometry.GetWidth() + 2 * m_Border,
                                           layout_geometry.GetHeight() + m_Border + m_TopBorder);
 
@@ -251,7 +251,7 @@
         m_input_window = new XInputWindow(title, take_focus, override_redirect);
 
       m_input_window->Show();
-      m_input_window->SetGeometry(GetGeometry());
+      m_input_window->SetGeometry(GetNativeGeometry());
       m_input_window_enabled = true;
     }
     else
@@ -344,7 +344,7 @@
   {
     // Define the geometry of some of the component of the window. Otherwise, if the composition layout is not set,
     // then the component won't be correctly placed after a SetGeometry. This can be redondant if the composition layout is set.
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
   }
 
   void BaseWindow::SetBorder(int border)
@@ -385,7 +385,7 @@
     {
       if (m_layout)
       {
-        m_layout->SetGeometry(GetGeometry());
+        m_layout->SetGeometry(GetNativeGeometry());
       }
 
       _entering_visible_state = true;
@@ -430,7 +430,7 @@
 
   void BaseWindow::NotifyConfigurationChange(int /* Width */, int /* Height */)
   {
-    Geometry geo = GetGeometry();
+    Geometry geo = GetNativeGeometry();
 
     if (m_configure_notify_callback)
     {
@@ -439,13 +439,13 @@
       if (geo.IsNull())
       {
         nuxDebugMsg("[BaseWindow::NotifyConfigurationChange] Received an invalid Geometry.");
-        geo = GetGeometry();
+        geo = GetNativeGeometry();
       }
       else
       {
         Area::SetGeometry(geo);
         // Get the geometry adjusted with respect to min and max dimension of this area.
-        geo = GetGeometry();
+        geo = GetNativeGeometry();
       }
     }
     else
 
=== modified file 'Nux/BasicView.h'
--- Nux/BasicView.h	2012-11-05 21:31:06 +0000
+++ Nux/BasicView.h	2012-12-17 15:42:23 +0000
@@ -32,7 +32,7 @@
   BasicView(NUX_FILE_LINE_PROTO);
   ~BasicView();
 
-  
+
 protected:
   void Draw(nux::GraphicsEngine& graphics_engine, bool force_draw);
 };
 
=== modified file 'Nux/Button.cpp'
--- Nux/Button.cpp	2012-11-05 21:31:06 +0000
+++ Nux/Button.cpp	2012-12-17 15:42:23 +0000
@@ -75,7 +75,7 @@
     item_order_ = IMAGE_FIRST;
     distribution_ = CENTER_OF_LAYOUT;
     space_between_items_ = 0;
-    
+
     layout_top_padding_ = 2;
     layout_right_padding_ = 2;
     layout_bottom_padding_ = 2;
@@ -341,7 +341,7 @@
 
   void Button::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
 
     graphics_engine.PushClippingRectangle(base);
 
@@ -367,7 +367,37 @@
     rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
 
     GetPainter().PushDrawSliceScaledTextureLayer(graphics_engine, base, ref_style, color::White, eAllCorners, true, rop);
-
+    GetPainter().PopPaintLayer();
+
+    graphics_engine.PopClippingRectangle();
+  }
+
+  void Button::DrawContent(GraphicsEngine& graphics_engine, bool force_draw)
+  {
+    Geometry base = GetNativeGeometry();
+
+    UXStyleImageRef ref_style = eIMAGE_STYLE_NONE;
+
+    if (visual_state_ == VISUAL_STATE_PRESSED)
+    {
+      ref_style = eBUTTON_FOCUS;
+    }
+    else if (visual_state_ == VISUAL_STATE_PRELIGHT)
+    {
+      ref_style = eBUTTON_PRELIGHT;
+    }
+    else
+    {
+      ref_style = eBUTTON_NORMAL;
+    }
+
+    TexCoordXForm texxform;
+    ROPConfig rop;
+    rop.Blend = true;
+    rop.SrcBlend = GL_ONE;
+    rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
+
+    GetPainter().PushSliceScaledTextureLayer(graphics_engine, base, ref_style, color::White, eAllCorners, true, rop);
     if (GetCompositionLayout())
     {
       GetPainter().PushPaintLayerStack();
@@ -378,14 +408,13 @@
 
         graphics_engine.PushClippingRectangle(clip_geo);
 
-        GetCompositionLayout()->ProcessDraw(graphics_engine, true);
+        GetCompositionLayout()->ProcessDraw(graphics_engine, force_draw);
 
         graphics_engine.PopClippingRectangle();
       }
       GetPainter().PopPaintLayerStack();
     }
     GetPainter().PopPaintLayer();
-    graphics_engine.PopClippingRectangle();
   }
 
   long Button::ComputeContentSize()
 
=== modified file 'Nux/Button.h'
--- Nux/Button.h	2011-10-22 06:17:42 +0000
+++ Nux/Button.h	2012-12-17 15:42:23 +0000
@@ -19,7 +19,6 @@
  *
  */
 
-
 #ifndef BUTTON_H
 #define BUTTON_H
 #include "AbstractButton.h"
@@ -72,9 +71,9 @@
       SPREAD_OVER_LAYOUT,
     };
 
-    Button(TextureArea *image, NUX_FILE_LINE_PROTO);
+    Button(TextureArea* image, NUX_FILE_LINE_PROTO);
     Button(const std::string& button_label, NUX_FILE_LINE_PROTO);
-    Button(const std::string& button_label, TextureArea *image, NUX_FILE_LINE_PROTO);
+    Button(const std::string& button_label, TextureArea* image, NUX_FILE_LINE_PROTO);
     Button(NUX_FILE_LINE_PROTO);
     virtual ~Button();
 
@@ -95,7 +94,7 @@
 
         @param label The label of the Button.
     */
-    void SetLabel(const std::string &button_label);
+    void SetLabel(const std::string& button_label);
 
     //!Return the label of this Button.
     /*!
@@ -115,7 +114,7 @@
 
         @param A TextureArea.
     */
-    void SetImage(TextureArea *image);
+    void SetImage(TextureArea* image);
 
     //! Get the image.
     /*!
@@ -243,17 +242,19 @@
     int top_clip_;
     int bottom_clip_;
 
-    bool SetLabelProperty(std::string &value, std::string const &str);
-
-    void Initialize(const std::string &str, TextureArea* texture_area);
-
-    void BuildLayout(const std::string &str, TextureArea* texture_area);
+    bool SetLabelProperty(std::string& value, std::string const& str);
+
+    void Initialize(const std::string& str, TextureArea* texture_area);
+
+    void BuildLayout(const std::string& str, TextureArea* texture_area);
 
     TextureArea *image_;
     Size image_minimum_size_;
     Size image_maximum_size_;
 
-    virtual void Draw(GraphicsEngine &graphics_engine, bool force_draw);
+    virtual void Draw(GraphicsEngine& graphics_engine, bool force_draw);
+    virtual void DrawContent(GraphicsEngine& graphics_engine, bool force_draw);
+
     virtual void RecvClick(int x, int y, unsigned long button_flags, unsigned long key_flags);
 //     virtual void PreLayoutManagement();
 //     virtual long PostLayoutManagement(long LayoutResult);
 
=== modified file 'Nux/CheckBox.cpp'
--- Nux/CheckBox.cpp	2012-11-05 21:31:06 +0000
+++ Nux/CheckBox.cpp	2012-12-17 15:42:23 +0000
@@ -28,9 +28,9 @@
 namespace nux
 {
   NUX_IMPLEMENT_OBJECT_TYPE(CheckBox);
-  
+
   CheckBox::CheckBox(const std::string &str, bool state, NUX_FILE_LINE_DECL)
-    : AbstractCheckedButton(str, state, NUX_FILE_LINE_PARAM)
+  : AbstractCheckedButton(str, state, NUX_FILE_LINE_PARAM)
   {
   }
 
@@ -38,9 +38,9 @@
   {
   }
 
-  void CheckBox::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
+  void CheckBox::Draw(GraphicsEngine& graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     graphics_engine.PushClippingRectangle(base);
 
     InteractState is;
@@ -62,7 +62,7 @@
 
     GetPainter().PushPaintLayerStack();
     {
-      GetPainter().PaintCheckBox(graphics_engine, check_area_->GetGeometry(), is, Color(0xff000000));
+      GetPainter().PaintCheckBox(graphics_engine, check_area_->GetGeometryRelativeTo(this), is, Color(0xff000000));
       static_text_->ProcessDraw(graphics_engine, true);
     }
     GetPainter().PopPaintLayerStack();
 
=== modified file 'Nux/ColorEditor.cpp'
--- Nux/ColorEditor.cpp	2012-11-05 21:31:06 +0000
+++ Nux/ColorEditor.cpp	2012-12-17 15:42:23 +0000
@@ -207,10 +207,10 @@
     m_Validator.SetMaximum(1.0);
     m_Validator.SetDecimals(2);
 
-    picker_area_        = new BasicView(NUX_TRACKER_LOCATION);
-    channel_area_   = new BasicView(NUX_TRACKER_LOCATION);
-    selected_color_area_       = new BasicView(NUX_TRACKER_LOCATION);
-    m_hlayout           = new HLayout(NUX_TRACKER_LOCATION);
+    picker_area_          = new BasicView(NUX_TRACKER_LOCATION);
+    channel_area_         = new BasicView(NUX_TRACKER_LOCATION);
+    selected_color_area_  = new BasicView(NUX_TRACKER_LOCATION);
+    m_hlayout             = new HLayout(NUX_TRACKER_LOCATION);
 
     channel_area_->mouse_down.connect(sigc::mem_fun(this, &ColorEditor::RecvMouseDown));
     channel_area_->mouse_up.connect(sigc::mem_fun(this, &ColorEditor::RecvMouseUp));
@@ -365,14 +365,23 @@
 
   void ColorEditor::Draw(GraphicsEngine &graphics_engine, bool force_draw)
   {
-    Geometry base = GetGeometry();
-
-    base.OffsetPosition(1, 1);
-    base.OffsetSize(-2, -2);
+    Geometry base = GetNativeGeometry();
 
     graphics_engine.PushClippingRectangle(base);
     GetPainter().PushDrawShapeLayer(graphics_engine, base, eSHAPE_CORNER_ROUND4, Color(0xFF000000), eAllCorners, true);
 
+    GetPainter().PopBackground();
+    graphics_engine.PopClippingRectangle();
+  }
+
+  void ColorEditor::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
+  {
+    Geometry base = GetNativeGeometry();
+    GetPainter().PushShapeLayer(graphics_engine, base, eSHAPE_CORNER_ROUND4, Color(0xFF000000), eAllCorners, true);
+
+    bool force = force_draw || IsFullRedraw();
+
+    GetLayout()->ProcessDraw(graphics_engine, force);
     if (m_ColorModel == color::RGB)
     {
       DrawRGB(graphics_engine, force_draw);
@@ -381,31 +390,6 @@
     {
       DrawHSV(graphics_engine, force_draw);
     }
-
-    GetPainter().PopBackground();
-    graphics_engine.PopClippingRectangle();
-  }
-
-  void ColorEditor::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
-  {
-    Geometry base = GetGeometry();
-    GetPainter().PushShapeLayer(graphics_engine, base, eSHAPE_CORNER_ROUND4, Color(0xFF000000), eAllCorners, true);
-
-    bool force = force_draw || IsFullRedraw();
-    redcheck->ProcessDraw(graphics_engine, force);
-    redtext->ProcessDraw(graphics_engine, force);
-    greencheck->ProcessDraw(graphics_engine, force);
-    greentext->ProcessDraw(graphics_engine, force);
-    bluecheck->ProcessDraw(graphics_engine, force);
-    bluetext->ProcessDraw(graphics_engine, force);
-
-    huecheck->ProcessDraw(graphics_engine, force);
-    hue_text_entry_->ProcessDraw(graphics_engine, force);
-    saturationcheck->ProcessDraw(graphics_engine, force);
-    saturation_text_entry_->ProcessDraw(graphics_engine, force);
-    valuecheck->ProcessDraw(graphics_engine, force);
-    value_text_entry_->ProcessDraw(graphics_engine, force);
-
     GetPainter().PopBackground();
   }
 
@@ -415,10 +399,12 @@
     int marker_position_x;
     int marker_position_y;
 
-    graphics_engine.PushClippingRectangle(channel_area_->GetGeometry());
-
-    marker_position_x = channel_area_->GetBaseX();
-    marker_position_y = channel_area_->GetBaseY() + m_VertMarkerPosition.y;
+    Geometry cgeo = channel_area_->GetGeometryRelativeTo(this);
+
+    graphics_engine.PushClippingRectangle(cgeo);
+
+    marker_position_x = cgeo.x;
+    marker_position_y = cgeo.y + m_VertMarkerPosition.y;
     GetPainter().Draw2DTriangleColor(graphics_engine, marker_position_x, marker_position_y - 5,
                                   marker_position_x + 5, marker_position_y,
                                   marker_position_x, marker_position_y + 5, Color(0.0f, 0.0f, 0.0f, 1.0f));
@@ -427,8 +413,8 @@
                                   marker_position_x + 4, marker_position_y,
                                   marker_position_x, marker_position_y + 4, Color(0.7f, 0.7f, 0.7f, 1.0f));
 
-    marker_position_x = channel_area_->GetBaseX() + channel_area_->GetBaseWidth();
-    marker_position_y = channel_area_->GetBaseY() + m_VertMarkerPosition.y;
+    marker_position_x = cgeo.x + cgeo.width;
+    marker_position_y = cgeo.y + m_VertMarkerPosition.y;
     GetPainter().Draw2DTriangleColor(graphics_engine, marker_position_x, marker_position_y - 5,
                                   marker_position_x - 5, marker_position_y,
                                   marker_position_x, marker_position_y + 5, Color(0.0f, 0.0f, 0.0f, 1.0f));
@@ -443,58 +429,66 @@
   {
     if (m_ColorModel == color::RGB)
     {
-      GetPainter().Paint2DQuadColor(graphics_engine, selected_color_area_->GetGeometry(), Color(rgb_));
+      GetPainter().Paint2DQuadColor(graphics_engine, selected_color_area_->GetGeometryRelativeTo(this), Color(rgb_));
       Color BaseChannelTop;
       Color BaseChannelBottom;
 
+      Geometry pgeo = picker_area_->GetGeometryRelativeTo(this);
+      Geometry ageo = picker_area_->GetAbsoluteGeometry();
+
       if (color_channel_ == color::RED)
       {
         m_RedShader->SetColor(rgb_.red, rgb_.green, rgb_.blue, 1.0f);
-        m_RedShader->SetScreenPositionOffset(graphics_engine.GetViewportX(), graphics_engine.GetViewportY());
+        m_RedShader->SetScreenPositionOffset(graphics_engine.GetViewportX() + ageo.x,
+            graphics_engine.GetViewportY() + ageo.y);
         BaseChannelTop = Color(1.0f, rgb_.green, rgb_.blue, 1.0f);
         BaseChannelBottom = Color(0.0f, rgb_.green, rgb_.blue, 1.0f);
         m_RedShader->Render(
-          picker_area_->GetBaseX(),
-          picker_area_->GetBaseY(),
+          pgeo.x,
+          pgeo.y + graphics_engine.GetViewportY(),
           0,
-          picker_area_->GetBaseWidth(),
-          picker_area_->GetBaseHeight(),
+          pgeo.width,
+          pgeo.height,
           graphics_engine.GetViewportWidth(), graphics_engine.GetViewportHeight()
         );
       }
       else if (color_channel_ == color::GREEN)
       {
         m_GreenShader->SetColor(rgb_.red, rgb_.green, rgb_.blue, 1.0f);
-        m_GreenShader->SetScreenPositionOffset(graphics_engine.GetViewportX(), graphics_engine.GetViewportY());
+        m_GreenShader->SetScreenPositionOffset(graphics_engine.GetViewportX() + ageo.x,
+            graphics_engine.GetViewportY() + ageo.y);
         BaseChannelTop = Color(rgb_.red, 1.0f, rgb_.blue, 1.0f);
         BaseChannelBottom = Color(rgb_.red, 0.0f, rgb_.blue, 1.0f);
         m_GreenShader->Render(
-          picker_area_->GetBaseX(),
-          picker_area_->GetBaseY(),
+          pgeo.x,
+          pgeo.y,
           0,
-          picker_area_->GetBaseWidth(),
-          picker_area_->GetBaseHeight(),
+          pgeo.width,
+          pgeo.height,
           graphics_engine.GetViewportWidth(), graphics_engine.GetViewportHeight()
         );
       }
       else if (color_channel_ == color::BLUE)
       {
         m_BlueShader->SetColor(rgb_.red, rgb_.green, rgb_.blue, 1.0f);
-        m_BlueShader->SetScreenPositionOffset(graphics_engine.GetViewportX(), graphics_engine.GetViewportY());
+        m_BlueShader->SetScreenPositionOffset(graphics_engine.GetViewportX() + ageo.x,
+            graphics_engine.GetViewportY() + ageo.y);
         BaseChannelTop = Color(rgb_.red, rgb_.green, 1.0f, 1.0f);
         BaseChannelBottom = Color(rgb_.red, rgb_.green, 0.0f, 1.0f);
         m_BlueShader->Render(
-          picker_area_->GetBaseX(),
-          picker_area_->GetBaseY(),
+          pgeo.x,
+          pgeo.y,
           0,
-          picker_area_->GetBaseWidth(),
-          picker_area_->GetBaseHeight(),
+          pgeo.width,
+          pgeo.height,
           graphics_engine.GetViewportWidth(), graphics_engine.GetViewportHeight()
         );
       }
 
-      Geometry pickermarker = Geometry(GetBaseX() + m_MarkerPosition.x - 2, GetBaseY() + m_MarkerPosition.y - 2, 5, 5);
-      Geometry basepickermarker = Geometry(channel_area_->GetBaseX(), channel_area_->GetBaseY() + m_VertMarkerPosition.y, 5, 5);
+      Geometry cgeo = channel_area_->GetGeometryRelativeTo(this);
+
+      Geometry pickermarker = Geometry(GetNativeX() + m_MarkerPosition.x - 2, GetNativeY() + m_MarkerPosition.y - 2, 5, 5);
+      Geometry basepickermarker = Geometry(cgeo.x, cgeo.y + m_VertMarkerPosition.y, 5, 5);
 
       Color color(rgb_.red, rgb_.green, rgb_.blue);
       float luma = color::LumaRed * rgb_.red + color::LumaGreen * rgb_.green + color::LumaBlue * rgb_.blue;
@@ -502,7 +496,7 @@
 
       GetPainter().Paint2DQuadWireframe(graphics_engine, pickermarker, one_minus_luma);
 
-      GetPainter().Paint2DQuadColor(graphics_engine, channel_area_->GetGeometry(), BaseChannelTop, BaseChannelBottom, BaseChannelBottom, BaseChannelTop);
+      GetPainter().Paint2DQuadColor(graphics_engine, cgeo, BaseChannelTop, BaseChannelBottom, BaseChannelBottom, BaseChannelTop);
       // Draw Marker on Base Chanel Area
       DrawBaseChannelMarker(graphics_engine);
     }
@@ -513,31 +507,38 @@
     if (m_ColorModel == color::HSV)
     {
       color::RedGreenBlue rgb(hsv_);
-      GetPainter().Paint2DQuadColor(graphics_engine, selected_color_area_->GetGeometry(), Color(rgb));
+      GetPainter().Paint2DQuadColor(graphics_engine, selected_color_area_->GetGeometryRelativeTo(this), Color(rgb_));
 
       Color BaseChannelTop;
       Color BaseChannelBottom;
 
+      Geometry pgeo = picker_area_->GetGeometryRelativeTo(this);
+      Geometry ageo = picker_area_->GetAbsoluteGeometry();
+
+      Geometry cgeo = channel_area_->GetGeometryRelativeTo(this);
+
       if (color_channel_ == color::HUE)
       {
+
         m_HueShader->SetColor(hsv_.hue, hsv_.saturation, hsv_.value, 1.0f);
-        m_HueShader->SetScreenPositionOffset(graphics_engine.GetViewportX(), graphics_engine.GetViewportY());
+        m_HueShader->SetScreenPositionOffset(graphics_engine.GetViewportX() + ageo.x,
+            graphics_engine.GetViewportY() + ageo.y);
         m_HueShader->Render(
-          picker_area_->GetBaseX(),
-          picker_area_->GetBaseY(),
+          pgeo.x,
+          pgeo.y,
           0,
-          picker_area_->GetBaseWidth(),
-          picker_area_->GetBaseHeight(),
+          pgeo.width,
+          pgeo.height,
           graphics_engine.GetViewportWidth(), graphics_engine.GetViewportHeight()
         );
 
-        Geometry P = channel_area_->GetGeometry();
+        Geometry P = channel_area_->GetGeometryRelativeTo(this);
 
         float s = 1.0f - 1.0f;
         float v = 1.0f;
         float fw = P.GetHeight() / 6;
 
-        Geometry p = Geometry(P.x, P.y, P.GetWidth(), fw);
+        Geometry p = Geometry(P.x, P.y, P.width, fw);
         GetPainter().Paint2DQuadVGradient(graphics_engine, p, Color(1.0f * v, s * v, s * v), Color(1.0f * v, s * v, 1.0f * v));
         p.SetY(P.y + fw);
         GetPainter().Paint2DQuadVGradient(graphics_engine, p, Color(1.0f * v, s * v, 1.0f * v), Color(s * v, s * v, 1.0f * v));
@@ -551,7 +552,7 @@
         p.SetHeight(P.GetHeight() - 5 * fw); // correct rounding errors
         GetPainter().Paint2DQuadVGradient(graphics_engine, p, Color(1.0f * v, 1.0f * v, s * v), Color(1.0f * v, s * v, s * v));
 
-        Geometry pickermarker = Geometry(GetBaseX() + m_MarkerPosition.x - 2, GetBaseY() + m_MarkerPosition.y - 2, 5, 5);
+        Geometry pickermarker = Geometry(GetNativeX() + m_MarkerPosition.x - 2, GetNativeY() + m_MarkerPosition.y - 2, 5, 5);
 
         float luma = color::LumaRed * rgb_.red + color::LumaGreen * rgb_.green + color::LumaBlue * rgb_.blue;
         Color one_minus_luma(1.0f - luma, 1.0f - luma, 1.0f - luma);
@@ -563,50 +564,56 @@
         if (value < 0.3f) value = 0.3f;
 
         m_SaturationShader->SetColor(hsv_.hue, hsv_.saturation, hsv_.value, 1.0f);
-        m_SaturationShader->SetScreenPositionOffset(graphics_engine.GetViewportX(), graphics_engine.GetViewportY());
+        m_SaturationShader->SetScreenPositionOffset(graphics_engine.GetViewportX() + ageo.x,
+            graphics_engine.GetViewportY() + ageo.y);
         BaseChannelTop = Color(color::RedGreenBlue(color::HueSaturationValue(hsv_.hue, 1.0f, value)));
         BaseChannelBottom = Color(value, value, value, 1.0f);
         m_SaturationShader->Render(
-          picker_area_->GetBaseX(),
-          picker_area_->GetBaseY(),
+          pgeo.x,
+          pgeo.y,
           0,
-          picker_area_->GetBaseWidth(),
-          picker_area_->GetBaseHeight(),
+          pgeo.width,
+          pgeo.height,
           graphics_engine.GetViewportWidth(), graphics_engine.GetViewportHeight()
         );
 
         //Geometry pickermarker = Geometry(GetX() + x - 2, GetY() + y -2, 5, 5);
-        Geometry pickermarker = Geometry(GetBaseX() + m_MarkerPosition.x - 2, GetBaseY() + m_MarkerPosition.y - 2, 5, 5);
+        Geometry pickermarker = Geometry(GetNativeX() + m_MarkerPosition.x - 2, GetNativeY() + m_MarkerPosition.y - 2, 5, 5);
 
         float luma = color::LumaRed * rgb_.red + color::LumaGreen * rgb_.green + color::LumaBlue * rgb_.blue;
         Color one_minus_luma(1.0f - luma, 1.0f - luma, 1.0f - luma);
 
         GetPainter().Paint2DQuadWireframe(graphics_engine, pickermarker, one_minus_luma);
-        GetPainter().Paint2DQuadColor(graphics_engine, channel_area_->GetGeometry(), BaseChannelTop, BaseChannelBottom, BaseChannelBottom, BaseChannelTop);
+        GetPainter().Paint2DQuadColor(graphics_engine,
+            cgeo,
+            BaseChannelTop, BaseChannelBottom, BaseChannelBottom, BaseChannelTop);
       }
       else if (color_channel_ == color::VALUE)
       {
         m_ValueShader->SetColor(hsv_.hue, hsv_.saturation, hsv_.value, 1.0f);
-        m_ValueShader->SetScreenPositionOffset(graphics_engine.GetViewportX(), graphics_engine.GetViewportY());
+        m_ValueShader->SetScreenPositionOffset(graphics_engine.GetViewportX() + ageo.x,
+            graphics_engine.GetViewportY() + ageo.y);
         BaseChannelTop = Color(color::RedGreenBlue(color::HueSaturationValue(hsv_.hue, hsv_.saturation, 1.0f)));
         BaseChannelBottom = Color(color::RedGreenBlue(color::HueSaturationValue(hsv_.hue, hsv_.saturation, 0.0f)));
         m_ValueShader->Render(
-          picker_area_->GetBaseX(),
-          picker_area_->GetBaseY(),
+          pgeo.x,
+          pgeo.y,
           0,
-          picker_area_->GetBaseWidth(),
-          picker_area_->GetBaseHeight(),
+          pgeo.width,
+          pgeo.height,
           graphics_engine.GetViewportWidth(), graphics_engine.GetViewportHeight()
         );
 
         //Geometry pickermarker = Geometry(GetX() + x - 2, GetY() + y -2, 5, 5);
-        Geometry pickermarker = Geometry(GetBaseX() + m_MarkerPosition.x - 2, GetBaseY() + m_MarkerPosition.y - 2, 5, 5);
+        Geometry pickermarker = Geometry(GetNativeX() + m_MarkerPosition.x - 2, GetNativeY() + m_MarkerPosition.y - 2, 5, 5);
 
         float luma = color::LumaRed * rgb_.red + color::LumaGreen * rgb_.green + color::LumaBlue * rgb_.blue;
         Color one_minus_luma(1.0f - luma, 1.0f - luma, 1.0f - luma);
 
         GetPainter().Paint2DQuadWireframe(graphics_engine, pickermarker, one_minus_luma);
-        GetPainter().Paint2DQuadColor(graphics_engine, channel_area_->GetGeometry(), BaseChannelTop, BaseChannelBottom, BaseChannelBottom, BaseChannelTop);
+        GetPainter().Paint2DQuadColor(graphics_engine,
+            cgeo,
+            BaseChannelTop, BaseChannelBottom, BaseChannelBottom, BaseChannelTop);
       }
 
       // Draw Marker on Base Chanel Area
@@ -1009,7 +1016,7 @@
     color_channel_ = colorchannel;
     RecvCheckColorModel(true, m_ColorModel, color_channel_);
 
-    /*FIXME - disabled because we lost radiogroup 
+    /*FIXME - disabled because we lost radiogroup
     if (color_channel_ == color::RED)
       radiogroup->ActivateButton(redcheck);
     else if (color_channel_ == color::GREEN)
 
=== modified file 'Nux/ColorEditor.h'
--- Nux/ColorEditor.h	2011-10-18 20:00:59 +0000
+++ Nux/ColorEditor.h	2012-12-17 15:42:23 +0000
@@ -154,9 +154,9 @@
 
     color::Channel   color_channel_;
     color::Model     m_ColorModel;
-    InputArea       *picker_area_;
-    InputArea       *channel_area_;
-    InputArea       *selected_color_area_;
+    BasicView       *picker_area_;
+    BasicView       *channel_area_;
+    BasicView       *selected_color_area_;
     HLayout        *m_hlayout;
     VLayout        *ctrllayout;
 
 
=== modified file 'Nux/ColorPreview.cpp'
--- Nux/ColorPreview.cpp	2012-11-05 21:31:06 +0000
+++ Nux/ColorPreview.cpp	2012-12-17 15:42:23 +0000
@@ -84,10 +84,10 @@
 
   void ColorPreview::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
 
     GetPainter().PaintBackground(graphics_engine, base);
-    GetPainter().PaintShape(graphics_engine, m_ColorArea->GetGeometry(), m_Color, eSHAPE_CORNER_ROUND4, false);
+    GetPainter().PaintShape(graphics_engine, m_ColorArea->GetGeometryRelativeTo(this), m_Color, eSHAPE_CORNER_ROUND4, false);
     //GetPainter().Paint2DQuadWireFrameColor(graphics_engine, base, Color(COLOR_BACKGROUND_SECONDARY));
     m_ColorValue->QueueDraw();
   }
@@ -138,5 +138,4 @@
   {
     m_Color = color;
   }
-
 }
 
=== modified file 'Nux/ColorPreview.h'
--- Nux/ColorPreview.h	2012-10-02 07:32:55 +0000
+++ Nux/ColorPreview.h	2012-12-17 15:42:23 +0000
@@ -59,7 +59,7 @@
 
     Color               m_Color;
     HLayout            *m_hlayout;
-    InputArea           *m_ColorArea;
+    BasicView           *m_ColorArea;
     StaticTextBox      *m_ColorValue;
     ColorDialogProxy   *m_DialogThreadProxy;
   };
 
=== modified file 'Nux/EditTextBox.cpp'
--- Nux/EditTextBox.cpp	2012-11-05 21:31:06 +0000
+++ Nux/EditTextBox.cpp	2012-12-17 15:42:23 +0000
@@ -93,7 +93,7 @@
 
   void EditTextBox::ScrollTimerInterrupt(void * /* v */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     const Event& event = GetGraphicsDisplay()->GetCurrentEvent();
 
     int X = event.x;
@@ -149,7 +149,7 @@
 
   void EditTextBox::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
 
     {
       graphics_engine.PushClippingRectangle(base);
@@ -159,7 +159,7 @@
       if (HasKeyboardFocus())
       {
 
-        GetPainter().PaintColorTextLineEdit(graphics_engine, GetGeometry(),
+        GetPainter().PaintColorTextLineEdit(graphics_engine, GetNativeGeometry(),
                                          m_KeyboardHandler.GetTextLine(),
                                          GetTextColor(),
                                          m_WriteAlpha,
@@ -176,7 +176,7 @@
       }
       else
       {
-        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetGeometry(),
+        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetNativeGeometry(),
                                       m_KeyboardHandler.GetTextLine(),
                                       GetTextColor());
       }
@@ -285,7 +285,7 @@
 
   void EditTextBox::RecvMouseDrag(int x, int y, int /* dx */, int /* dy */, unsigned long /* button_flags */, unsigned long /* key_flags */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
 
     int X = x + base.x;
 
@@ -309,7 +309,7 @@
   {
     long ret = View::PostLayoutManagement(LayoutResult);
 
-    m_KeyboardHandler.SetClipRegion(GetGeometry());
+    m_KeyboardHandler.SetClipRegion(GetNativeGeometry());
     return ret;
   }
 
@@ -325,7 +325,7 @@
     if (eventType == NUX_KEYDOWN)
       text_input_mode_ = true;
 
-    m_KeyboardHandler.ProcessKey(eventType, keysym, state, character[0], GetGeometry());
+    m_KeyboardHandler.ProcessKey(eventType, keysym, state, character[0], GetNativeGeometry());
 
 
     // When a key event happens, show the cursor.
 
=== modified file 'Nux/FileSelector.cpp'
--- Nux/FileSelector.cpp	2012-10-10 22:46:50 +0000
+++ Nux/FileSelector.cpp	2012-12-17 15:42:23 +0000
@@ -65,25 +65,25 @@
 
   void FileSelector::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
 
     GetPainter().PaintBackground(graphics_engine, base);
 
     if (m_OpenButton->IsMouseInside())
     {
 
-      GetPainter().PaintShapeCorner(graphics_engine, m_OpenButton->GetGeometry(), FILESELECTOR_BUTTON_MOUSEOVER_COLOR, eSHAPE_CORNER_ROUND4,
+      GetPainter().PaintShapeCorner(graphics_engine, m_OpenButton->GetNativeGeometry(), FILESELECTOR_BUTTON_MOUSEOVER_COLOR, eSHAPE_CORNER_ROUND4,
                                  eCornerTopRight | eCornerBottomRight, false);
     }
     else
     {
-      GetPainter().PaintShapeCorner(graphics_engine, m_OpenButton->GetGeometry(), FILESELECTOR_BUTTON_COLOR, eSHAPE_CORNER_ROUND4,
+      GetPainter().PaintShapeCorner(graphics_engine, m_OpenButton->GetNativeGeometry(), FILESELECTOR_BUTTON_COLOR, eSHAPE_CORNER_ROUND4,
                                  eCornerTopRight | eCornerBottomRight, false);
     }
 
     GeometryPositioning gp(eHACenter, eVACenter);
     Geometry TextureGeo = Geometry(0, 0, m_Texture->GetWidth(), m_Texture->GetHeight());
-    Geometry GeoPo = ComputeGeometryPositioning(m_OpenButton->GetGeometry(), TextureGeo, gp);
+    Geometry GeoPo = ComputeGeometryPositioning(m_OpenButton->GetNativeGeometry(), TextureGeo, gp);
 
     GetGraphicsDisplay()->GetGraphicsEngine()->GetRenderStates().SetBlend(TRUE, GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     GetGraphicsDisplay()->GetGraphicsEngine()->GetRenderStates().SetColorMask(TRUE, TRUE, TRUE, FALSE);
@@ -99,7 +99,7 @@
 
   void FileSelector::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
 
     m_FileEditTextBox->ProcessDraw(graphics_engine, force_draw);
   }
 
=== modified file 'Nux/FloatingWindow.cpp'
--- Nux/FloatingWindow.cpp	2012-11-12 20:59:56 +0000
+++ Nux/FloatingWindow.cpp	2012-12-17 15:42:23 +0000
@@ -68,7 +68,7 @@
 
     _title_bar_layout   = new HLayout(NUX_TRACKER_LOCATION);
     _title_bar_layout->Reference();
-    
+
     _minimize_button->SetMinMaxSize(20, 20);
     _minimize_button->SetGeometry(Geometry(0, 0, 20, 20));
     _close_button->SetMinimumSize(20, 20);
@@ -121,7 +121,7 @@
     _minimize_button->UnReference();
     CloseIcon->UnReference();
     MinimizeIcon->UnReference();
-    
+
     _title_bar_layout->UnParentObject();
     _title_bar_layout->UnReference();
   }
@@ -164,7 +164,7 @@
 
   void FloatingWindow::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     // The elements position inside the window are referenced to top-left window corner. So bring base to(0, 0).
     base.SetX(0);
     base.SetY(0);
@@ -174,12 +174,13 @@
 
     if (HasTitleBar())
     {
-      GetPainter().PaintShapeCorner(graphics_engine, Geometry(_title_bar->GetBaseX(), _title_bar->GetBaseY(),
+      Geometry tgeo = _title_bar->GetGeometryRelativeTo(this);
+      GetPainter().PaintShapeCorner(graphics_engine, Geometry(tgeo.x, tgeo.y,
                                  _title_bar->GetBaseWidth(), _title_bar->GetBaseHeight()), Color(0xFF2f2f2f),
                                  eSHAPE_CORNER_ROUND10, eCornerTopLeft | eCornerTopRight);
 
-      GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), _window_title_bar->GetGeometry(), _window_title, Color(0xFFFFFFFF), true, eAlignTextCenter);
-      GetPainter().Draw2DTextureAligned(graphics_engine, CloseIcon, _close_button->GetGeometry(), TextureAlignmentStyle(eTACenter, eTACenter));
+      GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), _window_title_bar->GetNativeGeometry(), _window_title, Color(0xFFFFFFFF), true, eAlignTextCenter);
+      GetPainter().Draw2DTextureAligned(graphics_engine, CloseIcon, _close_button->GetGeometryRelativeTo(this), TextureAlignmentStyle(eTACenter, eTACenter));
     }
 
     GetPainter().PopBackground();
@@ -188,7 +189,7 @@
 
   void FloatingWindow::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     // The elements position inside the window are referenced to top-left window corner. So bring base to(0, 0).
     base.SetX(0);
     base.SetY(0);
@@ -250,7 +251,7 @@
     }
 
     Geometry geo;
-    geo = GetGeometry();
+    geo = GetNativeGeometry();
 
     int ddx = 0;
     int ddy = 0;
@@ -283,7 +284,7 @@
     if (m_input_window != 0)
     {
       //nuxDebugMsg("Resize Input window: %d, %d, %d, %d", geo.x, geo.y, geo.width, geo.height);
-      m_input_window->SetGeometry(GetGeometry());
+      m_input_window->SetGeometry(GetNativeGeometry());
     }
 #endif
 
@@ -299,7 +300,7 @@
   void FloatingWindow::RecvTitleBarMouseDrag(int /* x */, int /* y */, int dx, int dy, unsigned long /* button_flags */, unsigned long /* key_flags */)
   {
     Geometry geo;
-    geo = GetGeometry();
+    geo = GetNativeGeometry();
     geo.OffsetPosition(dx, dy);
 
     // Set the Window Size and Position
@@ -313,7 +314,7 @@
     if (m_input_window != 0)
     {
       //nuxDebugMsg("Resize Input window: %d, %d, %d, %d", geo.x, geo.y, geo.width, geo.height);
-      m_input_window->SetGeometry(GetGeometry());
+      m_input_window->SetGeometry(GetNativeGeometry());
     }
 #endif
 
@@ -333,7 +334,7 @@
 // Here we need to position the header by hand because it is not under the control of vlayout.
   void FloatingWindow::PreLayoutManagement()
   {
-    Geometry geo = GetGeometry();
+    Geometry geo = GetNativeGeometry();
 
     if (m_configure_notify_callback)
     {
@@ -342,13 +343,13 @@
       if (geo.IsNull())
       {
         nuxDebugMsg("[FloatingWindow::PreLayoutManagement] Received an invalid Geometry.");
-        geo = GetGeometry();
+        geo = GetNativeGeometry();
       }
       else
       {
         Area::SetGeometry(geo);
         // Get the geometry adjusted with respect to min and max dimension of this area.
-        geo = GetGeometry();
+        geo = GetNativeGeometry();
       }
     }
 
@@ -377,17 +378,17 @@
   {
     if (IsSizeMatchContent() && m_layout)
     {
-      Geometry layout_geometry = m_layout->GetGeometry();
+      Geometry layout_geometry = m_layout->GetNativeGeometry();
 
-      Geometry WindowGeometry = Geometry(GetGeometry().x,
-                                          GetGeometry().y,
+      Geometry WindowGeometry = Geometry(GetNativeGeometry().x,
+                                          GetNativeGeometry().y,
                                           layout_geometry.GetWidth() + 2 * m_Border,
                                           layout_geometry.GetHeight() + m_Border + m_TopBorder);
 
       Area::SetGeometry(WindowGeometry);
     }
 
-    Geometry geo = GetGeometry();
+    Geometry geo = GetNativeGeometry();
 
     // Drag Bar Geometry
     if (HasTitleBar())
@@ -401,7 +402,7 @@
     _resize_handle->SetGeometry(temp);
 
     // Title Bar
-    _title_bar_layout->SetGeometry(_title_bar->GetGeometry());
+    _title_bar_layout->SetGeometry(_title_bar->GetGeometryRelativeTo(this));
     GetWindowThread()->ComputeElementLayout(_title_bar_layout);
 
     // A FloatingWindow must kill the result of the management and pass it to the parent Layout.
@@ -415,7 +416,7 @@
   {
     //ScrollView::ComputeContentPosition(offsetX, offsetY);
 
-    Geometry geo = GetGeometry();
+    Geometry geo = GetNativeGeometry();
 
     // Drag Bar Geometry
     if (HasTitleBar())
@@ -429,7 +430,7 @@
     _resize_handle->SetGeometry(temp);
 
     // Title Bar
-    _title_bar_layout->SetGeometry(_title_bar->GetGeometry());
+    _title_bar_layout->SetGeometry(_title_bar->GetGeometryRelativeTo(this));
     GetWindowThread()->ComputeElementLayout(_title_bar_layout);
 
   }
@@ -438,10 +439,10 @@
   {
     // Define the geometry of some of the component of the window. Otherwise, if the composition layout is not set,
     // then the component won't be correctly placed after a SetGeometry. This can be redundant if the composition layout is set.
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     _title_bar->SetGeometry(Geometry(0, 0, base.GetWidth(), _title_bar_height));
 
-    _title_bar_layout->SetGeometry(_title_bar->GetGeometry());
+    _title_bar_layout->SetGeometry(_title_bar->GetGeometryRelativeTo(this));
     GetWindowThread()->ComputeElementLayout(_title_bar_layout);
 
     // Size grip Geometry
 
=== modified file 'Nux/GridHLayout.cpp'
--- Nux/GridHLayout.cpp	2012-11-05 21:31:06 +0000
+++ Nux/GridHLayout.cpp	2012-12-17 15:42:23 +0000
@@ -196,7 +196,7 @@
     //  12  13  ..  ..  ..  ..
     // This is a left to right fill going down. An option can be added the fill the grid from top to bottom and going toward the right.
 
-    nux::Geometry base = GetGeometry();
+    nux::Geometry base = GetNativeGeometry();
     it = elements.begin();
     int num_row = 0;
     int num_column = 0;
@@ -340,7 +340,7 @@
 
     int original_width = GetBaseWidth();
 
-    nux::Geometry base = GetGeometry();
+    nux::Geometry base = GetNativeGeometry();
     it = elements.begin();
     int num_row = 0;
     int num_column = 0;
@@ -470,7 +470,7 @@
 
     graphics_engine.PushModelViewMatrix(Get2DMatrix());
 
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     Geometry absolute_geometry = GetAbsoluteGeometry();
     Geometry parent_geometry = absolute_geometry;
     Geometry visibility_geometry = absolute_geometry;
 
=== modified file 'Nux/GroupBox.cpp'
--- Nux/GroupBox.cpp	2012-10-02 07:32:55 +0000
+++ Nux/GroupBox.cpp	2012-12-17 15:42:23 +0000
@@ -47,9 +47,9 @@
 
   void GroupBox::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    graphics_engine.PushClippingRectangle(GetGeometry());
+    graphics_engine.PushClippingRectangle(GetNativeGeometry());
 
-    Geometry wireborder_geo = GetGeometry();
+    Geometry wireborder_geo = GetNativeGeometry();
 
     //if(bCaptionAvailable)
     {
@@ -66,7 +66,8 @@
     {
       //GetPainter().Paint2DQuadColor(m_CaptionArea.GetGeometry(), COLOR_BACKGROUND_PRIMARY);
       //GetPainter().PaintTextLineStatic(m_CaptionArea.GetGeometry(), m_CaptionArea.GetCaptionString(), eAlignTextCenter);
-      GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), m_CaptionArea.GetGeometry(), m_CaptionArea.GetBaseString(), GetTextColor(),
+      GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(),
+          m_CaptionArea.GetGeometryRelativeTo(this), m_CaptionArea.GetBaseString(), GetTextColor(),
                                     true, eAlignTextCenter);
     }
 
@@ -80,12 +81,12 @@
 
   void GroupBox::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
   {
-    graphics_engine.PushClippingRectangle(GetGeometry());
+    graphics_engine.PushClippingRectangle(GetNativeGeometry());
 
     if (m_layout)
     {
-      graphics_engine.PushClippingRectangle(m_layout->GetGeometry());
-      m_layout->ProcessDraw(graphics_engine, force_draw);
+      graphics_engine.PushClippingRectangle(GetLayout()->GetNativeGeometry());
+      GetLayout()->ProcessDraw(graphics_engine, force_draw);
       graphics_engine.PopClippingRectangle();
     }
 
@@ -114,7 +115,7 @@
     // Give the managed layout appropriate size and position..
     if (view_layout_)
     {
-      Geometry layout_geo = GetGeometry();
+      Geometry layout_geo = GetNativeGeometry();
       //if(bCaptionAvailable)
       {
         layout_geo.OffsetPosition(2, 20);
@@ -136,11 +137,11 @@
     // Only the size is change is important here of the GroupBox is important here.
 
     long ret = 0;
-    Geometry old_geo = Area::GetGeometry();
+    Geometry old_geo = Area::GetNativeGeometry();
 
     if (view_layout_)
     {
-      Geometry base = view_layout_->GetGeometry();
+      Geometry base = view_layout_->GetNativeGeometry();
       //if(bCaptionAvailable)
       {
         base.OffsetPosition(-2, -20);
@@ -154,7 +155,7 @@
       Area::SetGeometry(base);
     }
 
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     m_CaptionArea.SetBaseXY(base.x + 6, base.y);
 
     if (old_geo.GetWidth() > base.GetWidth())
@@ -180,8 +181,8 @@
     {
       //if(bCaptionAvailable)
       {
-        view_layout_->SetBaseX(GetBaseX() + 2);
-        view_layout_->SetBaseY(GetBaseY() + 20);
+        view_layout_->SetBaseX(GetNativeX() + 2);
+        view_layout_->SetBaseY(GetNativeY() + 20);
       }
 //        else
 //        {
@@ -191,7 +192,7 @@
       view_layout_->ComputeContentPosition(offsetX, offsetY);
     }
 
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     m_CaptionArea.SetBaseXY(base.x + 6, base.y);
   }
 
 
=== modified file 'Nux/GroupBox2.cpp'
--- Nux/GroupBox2.cpp	2012-11-05 21:31:06 +0000
+++ Nux/GroupBox2.cpp	2012-12-17 15:42:23 +0000
@@ -36,10 +36,8 @@
 
   GroupBox2::GroupBox2(const char *Caption, NUX_FILE_LINE_DECL)
     :   View(NUX_FILE_LINE_PARAM)
-    ,   bCaptionAvailable(false)
-    ,   m_layout(0)
   {
-    m_CaptionArea = new BasicView(NUX_TRACKER_LOCATION);
+    header_title_ = new BasicView(NUX_TRACKER_LOCATION);
     SetMinimumSize(DEFAULT_WIDGET_WIDTH + 5, PRACTICAL_WIDGET_HEIGHT + 5);
     SetBaseSize(DEFAULT_WIDGET_WIDTH + 5, PRACTICAL_WIDGET_HEIGHT + 5);
     SetCaption(Caption);
@@ -47,30 +45,28 @@
 
   GroupBox2::~GroupBox2()
   {
-    m_CaptionArea->Dispose();
+    header_title_->UnReference();
   }
 
   void GroupBox2::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    graphics_engine.PushClippingRectangle(GetGeometry());
+    graphics_engine.PushClippingRectangle(GetNativeGeometry());
 
-    Geometry header = GetGeometry();
+    Geometry header = GetNativeGeometry();
     header.SetHeight(TOP_HEADER_HEIGHT);
-    Geometry layoutgeomerty = GetGeometry();
-    layoutgeomerty.OffsetPosition(0, TOP_HEADER_HEIGHT);
-    layoutgeomerty.OffsetSize(0, -TOP_HEADER_HEIGHT);
+    Geometry content_area = GetNativeGeometry();
+    content_area.OffsetPosition(0, TOP_HEADER_HEIGHT);
+    content_area.OffsetSize(0, -TOP_HEADER_HEIGHT);
     GetPainter().PaintShapeCorner(graphics_engine, header, Color(0xFF000000), eSHAPE_CORNER_ROUND4, eCornerTopLeft | eCornerTopRight, false);
 
-    GetPainter().PushDrawShapeLayer(graphics_engine, layoutgeomerty, eSHAPE_CORNER_ROUND4, GROUPBOX2_HEADER_BASE_COLOR, eCornerBottomLeft | eCornerBottomRight);
+    GetPainter().PushDrawShapeLayer(graphics_engine, content_area, eSHAPE_CORNER_ROUND4, GROUPBOX2_HEADER_BASE_COLOR,
+        eCornerBottomLeft | eCornerBottomRight);
 
     //if(bCaptionAvailable)
     {
-      GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), m_CaptionArea->GetGeometry(), m_CaptionArea->GetBaseString(), GROUPBOX2_HEADER_TEXT_COLOR);
-    }
-
-    if (m_layout != 0)
-    {
-      m_layout->QueueDraw();
+      GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(),
+          header_title_->GetGeometry(),
+          header_title_->GetBaseString(), GROUPBOX2_HEADER_TEXT_COLOR);
     }
 
     GetPainter().PopBackground();
@@ -79,23 +75,21 @@
 
   void GroupBox2::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
   {
-    if (m_layout == 0)
+    if(GetLayout() == NULL)
       return;
 
-    graphics_engine.PushClippingRectangle(m_layout->GetGeometry());
-    Geometry layoutgeomerty = GetGeometry();
-    layoutgeomerty.OffsetPosition(0, TOP_HEADER_HEIGHT);
-    layoutgeomerty.OffsetSize(0, -TOP_HEADER_HEIGHT);
-
-    if (force_draw)
-      GetPainter().PushDrawShapeLayer(graphics_engine, layoutgeomerty, eSHAPE_CORNER_ROUND4, GROUPBOX2_HEADER_BASE_COLOR, eAllCorners);
-    else
-      GetPainter().PushShapeLayer(graphics_engine, layoutgeomerty, eSHAPE_CORNER_ROUND4, GROUPBOX2_HEADER_BASE_COLOR, eAllCorners);
-
-    if (m_layout)
+    Geometry content_area = GetNativeGeometry();
+    content_area.OffsetPosition(0, TOP_HEADER_HEIGHT);
+    content_area.OffsetSize(0, -TOP_HEADER_HEIGHT);
+
+    graphics_engine.PushClippingRectangle(content_area);
+
+    GetPainter().PushShapeLayer(graphics_engine, content_area, eSHAPE_CORNER_ROUND4, GROUPBOX2_HEADER_BASE_COLOR, eAllCorners);
+
+    if (GetLayout())
     {
-      graphics_engine.PushClippingRectangle(m_layout->GetGeometry());
-      m_layout->ProcessDraw(graphics_engine, force_draw);
+      graphics_engine.PushClippingRectangle(GetLayout()->GetGeometry());
+      GetLayout()->ProcessDraw(graphics_engine, force_draw);
       graphics_engine.PopClippingRectangle();
     }
 
@@ -110,8 +104,6 @@
       return false;
     }
 
-    m_layout = layout;
-
     return true;
   }
 
@@ -120,17 +112,10 @@
     // Give the managed layout appropriate size and position..
     if (GetCompositionLayout())
     {
-      Geometry layout_geo = GetGeometry();
-      //if(bCaptionAvailable)
-      {
-        layout_geo.OffsetPosition(X_MARGIN, TOP_HEADER_HEIGHT + Y_MARGIN);
-        layout_geo.OffsetSize(-2 * X_MARGIN, -TOP_HEADER_HEIGHT - 2 * Y_MARGIN);
-      }
-//        else
-//        {
-//            layout_geo.OffsetPosition(X_MARGIN, 2);
-//            layout_geo.OffsetSize(-2*X_MARGIN, -2*Y_MARGIN);
-//        }
+      Geometry layout_geo = GetNativeGeometry();
+      layout_geo.OffsetPosition(X_MARGIN, TOP_HEADER_HEIGHT + Y_MARGIN);
+      layout_geo.OffsetSize(-2 * X_MARGIN, -TOP_HEADER_HEIGHT - 2 * Y_MARGIN);
+
       GetCompositionLayout()->SetGeometry(layout_geo);
     }
   }
@@ -146,22 +131,15 @@
 
     if (GetCompositionLayout())
     {
-      Geometry base = GetCompositionLayout()->GetGeometry();
-      //if(bCaptionAvailable)
-      {
-        base.OffsetPosition(-X_MARGIN, -TOP_HEADER_HEIGHT - Y_MARGIN);
-        base.OffsetSize(2 * X_MARGIN, TOP_HEADER_HEIGHT + 2 * Y_MARGIN);
-      }
-//        else
-//        {
-//            base.OffsetPosition(-X_MARGIN, -2);
-//            base.OffsetSize(2*X_MARGIN, 2*Y_MARGIN);
-//        }
+      Geometry base = GetCompositionLayout()->GetNativeGeometry();
+      base.OffsetPosition(-X_MARGIN, -TOP_HEADER_HEIGHT - Y_MARGIN);
+      base.OffsetSize(2 * X_MARGIN, TOP_HEADER_HEIGHT + 2 * Y_MARGIN);
+
       Area::SetGeometry(base);
     }
 
-    Geometry base = GetGeometry();
-    m_CaptionArea->SetBaseXY(base.x + CAPTION_X_MARGIN, base.y + (TOP_HEADER_HEIGHT - m_CaptionArea->GetBaseHeight()) / 2);
+    Geometry base = GetNativeGeometry();
+    header_title_->SetBaseXY(base.x + CAPTION_X_MARGIN, base.y + (TOP_HEADER_HEIGHT - header_title_->GetBaseHeight()) / 2);
 
 
     if (old_geo.GetWidth() > base.GetWidth())
@@ -185,45 +163,35 @@
   {
     if (GetCompositionLayout())
     {
-      //if(bCaptionAvailable)
-      {
-        GetCompositionLayout()->SetBaseX(GetBaseX() + X_MARGIN);
-        GetCompositionLayout()->SetBaseY(GetBaseY() + TOP_HEADER_HEIGHT + Y_MARGIN);
-      }
-//        else
-//        {
-//            m_compositionLayout->SetX(GetX() + X_MARGIN);
-//            m_compositionLayout->SetY(GetY() + Y_MARGIN);
-//        }
+      GetCompositionLayout()->SetBaseX(GetNativeX() + X_MARGIN);
+      GetCompositionLayout()->SetBaseY(GetNativeY() + TOP_HEADER_HEIGHT + Y_MARGIN);
       GetCompositionLayout()->ComputeContentPosition(offsetX, offsetY);
     }
 
-    Geometry base = GetGeometry();
-    m_CaptionArea->SetBaseXY(base.x + CAPTION_X_MARGIN, base.y + (TOP_HEADER_HEIGHT - m_CaptionArea->GetBaseHeight()) / 2);
+    Geometry base = GetNativeGeometry();
+    header_title_->SetBaseXY(base.x + CAPTION_X_MARGIN, base.y + (TOP_HEADER_HEIGHT - header_title_->GetBaseHeight()) / 2);
   }
 
   void GroupBox2::SetCaption(const char *Caption)
   {
     if ((Caption == 0) || (StringLength(Caption) == 0))
     {
-      //bCaptionAvailable = false;
-      m_CaptionArea->SetBaseString("");
-      m_CaptionArea->SetMinimumSize(DEFAULT_WIDGET_WIDTH, PRACTICAL_WIDGET_HEIGHT);
-      m_CaptionArea->SetBaseSize(DEFAULT_WIDGET_WIDTH, PRACTICAL_WIDGET_HEIGHT);
+      header_title_->SetBaseString("");
+      header_title_->SetMinimumSize(DEFAULT_WIDGET_WIDTH, PRACTICAL_WIDGET_HEIGHT);
+      header_title_->SetBaseSize(DEFAULT_WIDGET_WIDTH, PRACTICAL_WIDGET_HEIGHT);
     }
     else
     {
-      //bCaptionAvailable = true;
-      m_CaptionArea->SetBaseString(Caption);
-      m_CaptionArea->SetMinimumSize(4 + GetSysBoldFont()->GetStringWidth(Caption), PRACTICAL_WIDGET_HEIGHT);
-      m_CaptionArea->SetBaseSize(4 + GetSysBoldFont()->GetStringWidth(Caption), PRACTICAL_WIDGET_HEIGHT);
+      header_title_->SetBaseString(Caption);
+      header_title_->SetMinimumSize(4 + GetSysBoldFont()->GetStringWidth(Caption), PRACTICAL_WIDGET_HEIGHT);
+      header_title_->SetBaseSize(4 + GetSysBoldFont()->GetStringWidth(Caption), PRACTICAL_WIDGET_HEIGHT);
 
       Size s = GetMinimumSize();
 
-      if (s.width < 2 * CAPTION_X_MARGIN + m_CaptionArea->GetBaseWidth())
+      if (s.width < 2 * CAPTION_X_MARGIN + header_title_->GetBaseWidth())
       {
-        SetMinimumSize(2 * CAPTION_X_MARGIN + m_CaptionArea->GetBaseWidth(), s.height);
-        SetBaseSize(2 * CAPTION_X_MARGIN + m_CaptionArea->GetBaseWidth(), s.height);
+        SetMinimumSize(2 * CAPTION_X_MARGIN + header_title_->GetBaseWidth(), s.height);
+        SetBaseSize(2 * CAPTION_X_MARGIN + header_title_->GetBaseWidth(), s.height);
       }
     }
   }
 
=== modified file 'Nux/GroupBox2.h'
--- Nux/GroupBox2.h	2012-11-05 21:31:06 +0000
+++ Nux/GroupBox2.h	2012-12-17 15:42:23 +0000
@@ -39,22 +39,20 @@
     GroupBox2(const char *Caption = "", NUX_FILE_LINE_PROTO);
     ~GroupBox2();
 
-    virtual void Draw(GraphicsEngine &graphics_engine, bool force_draw);
-    virtual void DrawContent(GraphicsEngine &graphics_engine, bool force_draw);
-
     virtual bool SetLayout(Layout *layout);
     void SetCaption(const char *Caption);
-  
+
   protected:
     virtual bool AcceptKeyNavFocus();
+    virtual void Draw(GraphicsEngine &graphics_engine, bool force_draw);
+    virtual void DrawContent(GraphicsEngine &graphics_engine, bool force_draw);
+
   private:
     virtual void PreLayoutManagement();
     virtual long PostLayoutManagement(long LayoutResult);
     virtual void ComputeContentPosition(float offsetX, float offsetY);
 
-    bool        bCaptionAvailable;
-    BasicView   *m_CaptionArea;
-    Layout     *m_layout;
+    BasicView   *header_title_;
 
     static int CAPTION_X_MARGIN;
     static int X_MARGIN;
 
=== modified file 'Nux/HLayout.cpp'
--- Nux/HLayout.cpp	2012-12-08 01:03:38 +0000
+++ Nux/HLayout.cpp	2012-12-17 15:42:23 +0000
@@ -240,8 +240,8 @@
       HLayoutManagement(width, height);
 
       // Objects have been resized, now position them.
-      int current_x = GetBaseX() + left_padding_;
-      int current_y = GetBaseY() + top_padding_;
+      int current_x = left_padding_;
+      int current_y = top_padding_;
 
       int offset_space = 0;
       int space_after_element = 0;
@@ -360,9 +360,9 @@
 
         if (((*it)->IsLayout()  || (*it)->IsView()) /*&& ((*it)->IsLayoutDone() == false)*/ /*&& ((*it)->GetScaleFactor() != 0)*/)
         {
-          Geometry pre_geo = (*it)->GetGeometry();
+          Geometry pre_geo = (*it)->GetNativeGeometry();
           ret = (*it)->ComputeContentSize();
-          Geometry post_geo = (*it)->GetGeometry();
+          Geometry post_geo = (*it)->GetNativeGeometry();
 
           bool larger_width    = pre_geo.width < post_geo.width;
           bool smaller_width   = pre_geo.width > post_geo.width;
@@ -769,8 +769,8 @@
       height -= (top_padding_ + bottom_padding_);
 
       // Objects have been resized, now position them.
-      int current_x = GetBaseX() + left_padding_ + offsetX; // add base offset in X(used for scrolling)
-      int current_y = GetBaseY() + top_padding_ + offsetY; // add base offset in Y(used for scrolling)
+      int current_x = left_padding_ + offsetX; // add base offset in X(used for scrolling)
+      int current_y = top_padding_ + offsetY; // add base offset in Y(used for scrolling)
 
       int offset_space = 0;
       int element_margin = 0;
 
=== modified file 'Nux/HScrollBar.cpp'
--- Nux/HScrollBar.cpp	2012-11-05 21:31:06 +0000
+++ Nux/HScrollBar.cpp	2012-12-17 15:42:23 +0000
@@ -277,17 +277,17 @@
 
   void HScrollBar::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     GetPainter().PaintBackground(graphics_engine, base);
     base.OffsetPosition(HSCROLLBAR_WIDTH, 0);
     base.OffsetSize(-2 * HSCROLLBAR_WIDTH, 0);
     GetPainter().PaintShape(graphics_engine, base,
                          Color(COLOR_SCROLLBAR_TRACK), eHSCROLLBAR, false);
 
-    GetPainter().PaintShape(graphics_engine, _scroll_left_button->GetGeometry(), Color(0xFFFFFFFF), eSCROLLBAR_TRIANGLE_LEFT);
-    GetPainter().PaintShape(graphics_engine, _scroll_right_button->GetGeometry(), Color(0xFFFFFFFF), eSCROLLBAR_TRIANGLE_RIGHT);
+    GetPainter().PaintShape(graphics_engine, _scroll_left_button->GetGeometryRelativeTo(this), Color(0xFFFFFFFF), eSCROLLBAR_TRIANGLE_LEFT);
+    GetPainter().PaintShape(graphics_engine, _scroll_right_button->GetGeometryRelativeTo(this), Color(0xFFFFFFFF), eSCROLLBAR_TRIANGLE_RIGHT);
 
-    GetPainter().PaintShape(graphics_engine, _slider->GetGeometry(),
+    GetPainter().PaintShape(graphics_engine, _slider->GetGeometryRelativeTo(this),
                          Color(0.2156 * m_color_factor, 0.2156 * m_color_factor, 0.2156 * m_color_factor, 1.0f),
                          eHSCROLLBAR, true);
   };
 
=== modified file 'Nux/HSplitter.cpp'
--- Nux/HSplitter.cpp	2012-11-17 16:15:55 +0000
+++ Nux/HSplitter.cpp	2012-12-17 15:42:23 +0000
@@ -49,8 +49,8 @@
     mvt_dy = 0;
     m_current_x = 0;
     m_current_y = 0;
-    m_current_width = 200;
-    m_current_height = 200;
+    m_current_width = 100;
+    m_current_height = 100;
 
     //SetMinimumSize(200,200);
     SetGeometry(Geometry(m_current_x, m_current_y, m_current_width, m_current_height));
@@ -77,20 +77,18 @@
 
   void HSplitter::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    graphics_engine.PushClippingRectangle(GetGeometry());
-    Geometry base = GetGeometry();
-//    std::vector<View*>::iterator it;
-//    for (it = m_InterfaceObject.begin(); it != m_InterfaceObject.end(); it++)
-//    {
-//        (*it)->ProcessDraw(force_draw);
-//    }
-
-    GetPainter().PaintBackground(graphics_engine, base);
+    // Save the model view matrix. We reuse it when drawing the splitter overlay during a resize operation.
+    local_model_view_matrix_ = graphics_engine.GetModelViewMatrix();
+
+    Geometry base = GetNativeGeometry();
+    graphics_engine.PushClippingRectangle(base);
+    std::vector<Area *>::iterator it;
+
     std::vector<MySplitter *>::iterator it_splitter;
 
     for (it_splitter = m_SplitterObject.begin(); it_splitter != m_SplitterObject.end(); it_splitter++)
     {
-      Geometry geo = (*it_splitter)->GetGeometry();
+      Geometry geo = (*it_splitter)->GetGeometryRelativeTo(this);
       Geometry grip_geo;
       int w = 20;
 
@@ -118,19 +116,19 @@
 
   void HSplitter::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     graphics_engine.PushClippingRectangle(base);
+
     bool need_redraw = IsRedrawNeeded();
 
     std::vector<MySplitter *>::iterator it_splitter;
     std::vector<Area *>::iterator it;
 
-    //for(it = m_InterfaceObject.begin(); it != m_InterfaceObject.end(); it++)
     for (it = m_InterfaceObject.begin(), it_splitter = m_SplitterObject.begin();
          it != m_InterfaceObject.end();
          it++, it_splitter++)
     {
-      Geometry sgeo = (*it_splitter)->GetGeometry();
+      Geometry sgeo = (*it_splitter)->GetGeometryRelativeTo(this);
       graphics_engine.PushClippingRectangle(Rect(
                                           base.x, base.y, base.GetWidth(), sgeo.y - base.y));
 
@@ -182,13 +180,20 @@
   void HSplitter::OverlayDrawing(GraphicsEngine &graphics_engine)
   {
     unsigned int num_element = (unsigned int) m_SplitterObject.size();
-
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
+
+    // Transform this area position with the model view matrix we captured earlier.
+    Vector4 v = local_model_view_matrix_ * Vector4(base.x, base.y, 0.0f, 1.0f);
+
+    // base is now in window coordinates
+    base.x = v.x;
+    base.y = v.y;
 
     if (m_focus_splitter_index >= 0)
     {
-      Geometry geo = m_SplitterObject[m_focus_splitter_index]->GetGeometry();
-      geo.OffsetPosition(mvt_dx, mvt_dy);
+      Geometry geo = m_SplitterObject[m_focus_splitter_index]->GetGeometryRelativeTo(this);
+
+      geo.OffsetPosition(base.x + mvt_dx, base.y + mvt_dy);
 
       if (m_focus_splitter_index == 0 && num_element > 1)
       {
@@ -197,22 +202,22 @@
           geo.SetY(base.y);
         }
 
-        if (geo.y  + HSPLITTERHEIGHT > m_SplitterObject[m_focus_splitter_index + 1]->GetGeometry().y)
+        if (geo.y  + HSPLITTERHEIGHT > base.y + m_SplitterObject[m_focus_splitter_index + 1]->GetGeometryRelativeTo(this).y)
         {
-          geo.SetY(m_SplitterObject[m_focus_splitter_index+1]->GetGeometry().y - HSPLITTERHEIGHT);
+          geo.SetY(base.y + m_SplitterObject[m_focus_splitter_index+1]->GetGeometryRelativeTo(this).y - HSPLITTERHEIGHT);
         }
       }
 
       if ((m_focus_splitter_index > 0) && (m_focus_splitter_index < (int) num_element - 1))
       {
-        if (geo.y < m_SplitterObject[m_focus_splitter_index - 1]->GetGeometry().y + HSPLITTERHEIGHT)
+        if (geo.y < m_SplitterObject[m_focus_splitter_index - 1]->GetGeometryRelativeTo(this).y + HSPLITTERHEIGHT)
         {
-          geo.SetY(m_SplitterObject[m_focus_splitter_index - 1]->GetGeometry().y + HSPLITTERHEIGHT);
+          geo.SetY(m_SplitterObject[m_focus_splitter_index - 1]->GetGeometryRelativeTo(this).y + HSPLITTERHEIGHT);
         }
 
-        if (geo.y + HSPLITTERHEIGHT > m_SplitterObject[m_focus_splitter_index + 1]->GetGeometry().y)
+        if (geo.y + HSPLITTERHEIGHT > m_SplitterObject[m_focus_splitter_index + 1]->GetGeometryRelativeTo(this).y)
         {
-          geo.SetY(m_SplitterObject[m_focus_splitter_index + 1]->GetGeometry().y - HSPLITTERHEIGHT);
+          geo.SetY(m_SplitterObject[m_focus_splitter_index + 1]->GetGeometryRelativeTo(this).y - HSPLITTERHEIGHT);
         }
       }
 
@@ -255,8 +260,8 @@
   long HSplitter::ComputeContentSize()
   {
     unsigned int num_element = (unsigned int) m_InterfaceObject.size();
-    int x = GetBaseX();
-    int y = GetBaseY();
+    int x = 0;
+    int y = 0;
     int w = GetBaseWidth();
     int h = GetBaseHeight();
 
@@ -289,7 +294,7 @@
     {
       for (unsigned int i = 0; i < num_element; i++)
       {
-        Geometry splitter_geo = m_SplitterObject[i]->GetGeometry();
+        Geometry splitter_geo = m_SplitterObject[i]->GetGeometryRelativeTo(this);
         splitter_geo.SetWidth(w);
         splitter_geo.SetX(x);
 
@@ -305,7 +310,7 @@
 
       for (unsigned int i = 0; i < num_element; i++)
       {
-        Geometry splitter_geo = m_SplitterObject[i]->GetGeometry();
+        Geometry splitter_geo = m_SplitterObject[i]->GetGeometryRelativeTo(this);
         // compute percentage of space occupied by the element i;
         // width of element i = m_SplitterObject[i]->GetY() - previous_splliter_end
         int splitter_start = m_SplitterObject[i]->GetBaseY();
@@ -332,7 +337,7 @@
 
     for (unsigned int i = 0; i < num_element; i++)
     {
-      Geometry splitter_geo = m_SplitterObject[i]->GetGeometry();
+      Geometry splitter_geo = m_SplitterObject[i]->GetGeometryRelativeTo(this);
 
       //m_InterfaceObject[i]->SetGeometry(Geometry(x, accheight, w, splitter_geo.y - accheight));
 
@@ -367,8 +372,8 @@
   void HSplitter::ResetSplitConfig()
   {
 
-    int x = GetBaseX();
-    int y = GetBaseY();
+    int x = 0;
+    int y = 0;
     int w = GetBaseWidth();
     int h = GetBaseHeight();
     unsigned int num_element = (unsigned int) m_InterfaceObject.size();
@@ -408,6 +413,7 @@
       y += stretchfactor * max_size / max_stretch;
       Geometry geo(x, y, w, HSPLITTERHEIGHT);
       m_SplitterObject[i]->SetGeometry(geo);
+      y += HSPLITTERHEIGHT;
     }
 
     m_SplitterObject[num_element-1]->SetBaseX(y + h - HSPLITTERHEIGHT);
@@ -431,7 +437,7 @@
   {
     if (mvt_dy)
     {
-      Geometry geo = m_SplitterObject[header_pos]->GetGeometry();
+      Geometry geo = m_SplitterObject[header_pos]->GetGeometryRelativeTo(this);
       geo.OffsetPosition(0, mvt_dy);
 
       unsigned int num_element = (unsigned int) m_SplitterObject.size();
@@ -439,8 +445,8 @@
       if (header_pos < (int) num_element - 1)
       {
         // Make the splitter bar stick to the next one if the distance between them is less than HSTICK_SIZE.
-        if (m_SplitterObject[header_pos + 1]->GetGeometry().y - geo.y - HSPLITTERHEIGHT < HSTICK_SIZE)
-          geo.SetY( m_SplitterObject[header_pos + 1]->GetGeometry().y - HSPLITTERHEIGHT );
+        if (m_SplitterObject[header_pos + 1]->GetGeometryRelativeTo(this).y - geo.y - HSPLITTERHEIGHT < HSTICK_SIZE)
+          geo.SetY( m_SplitterObject[header_pos + 1]->GetGeometryRelativeTo(this).y - HSPLITTERHEIGHT );
       }
 
       m_SplitterObject[header_pos]->SetGeometry(geo);
@@ -459,7 +465,7 @@
 
   void HSplitter::OnSplitterMouseDrag(int /* x */, int y, int /* dx */, int /* dy */, unsigned long /* button_flags */, unsigned long /* key_flags */, int header_pos)
   {
-    Geometry geo = m_SplitterObject[header_pos]->GetGeometry();
+    Geometry geo = m_SplitterObject[header_pos]->GetGeometryRelativeTo(this);
     int num_element = (int) m_SplitterObject.size();
 
     if (header_pos == num_element - 1)
@@ -489,17 +495,17 @@
 
   void HSplitter::ResizeSplitter(int header_pos)
   {
-    Geometry geo = m_SplitterObject[header_pos]->GetGeometry();
+    Geometry geo = m_SplitterObject[header_pos]->GetGeometryRelativeTo(this);
     int num_element = (int) m_SplitterObject.size();
 
-    if ((header_pos == 0) && (m_SplitterObject[header_pos]->GetBaseY() < GetBaseY()))
+    if ((header_pos == 0) && (m_SplitterObject[header_pos]->GetBaseY() < 0))
     {
-      m_SplitterObject[header_pos]->SetBaseY(GetBaseY());
+      m_SplitterObject[header_pos]->SetBaseY(0);
     }
 
-    if ((header_pos == num_element - 1) && (m_SplitterObject[header_pos]->GetBaseY() > GetBaseY() + GetBaseHeight() - HSPLITTERHEIGHT))
+    if ((header_pos == num_element - 1) && (m_SplitterObject[header_pos]->GetBaseY() > 0 + GetBaseHeight() - HSPLITTERHEIGHT))
     {
-      m_SplitterObject[header_pos]->SetBaseY(GetBaseY() + GetBaseHeight() - HSPLITTERHEIGHT);
+      m_SplitterObject[header_pos]->SetBaseY(GetBaseHeight() - HSPLITTERHEIGHT);
     }
 
     if (header_pos < (int) num_element - 1)
 
=== modified file 'Nux/HSplitter.h'
--- Nux/HSplitter.h	2012-11-05 21:31:06 +0000
+++ Nux/HSplitter.h	2012-12-17 15:42:23 +0000
@@ -79,6 +79,7 @@
     virtual Area* KeyNavIteration(KeyNavDirection direction);
 
   private:
+    Matrix4 local_model_view_matrix_;
     typedef BasicView MySplitter;
     std::vector<Area *> m_InterfaceObject;
     std::vector<MySplitter *> m_SplitterObject;
 
=== modified file 'Nux/Layout.cpp'
--- Nux/Layout.cpp	2012-11-05 21:31:06 +0000
+++ Nux/Layout.cpp	2012-12-17 15:42:23 +0000
@@ -35,7 +35,7 @@
     space_between_children_ = 0;
 
     left_padding_      = 0;
-    right_padding_     = 0;    
+    right_padding_     = 0;
     top_padding_      = 0;
     bottom_padding_   = 0;
     m_contentWidth      = 0;
@@ -496,11 +496,11 @@
     return NULL;
   }
 
-  void Layout::ProcessDraw(GraphicsEngine &graphics_engine, bool force_draw)
+  void Layout::ProcessDraw(GraphicsEngine& graphics_engine, bool force_draw)
   {
     std::list<Area *>::iterator it;
 
-    if (RedirectRenderingToTexture())
+    if (GetRedirectRenderingToTexture())
     {
       if (update_backup_texture_ || force_draw || draw_cmd_queued_)
       {
@@ -508,6 +508,9 @@
         BeginBackupTextureRendering(graphics_engine, force_draw);
         {
           graphics_engine.PushModelViewMatrix(Get2DMatrix());
+          Matrix4 mat;
+          mat.Translate(GetX(), GetY(), 0);
+          graphics_engine.PushModelViewMatrix(mat);
 
           for (it = _layout_element_list.begin(); it != _layout_element_list.end(); it++)
           {
@@ -526,45 +529,36 @@
             }
           }
           graphics_engine.PopModelViewMatrix();
+          graphics_engine.PopModelViewMatrix();
         }
         EndBackupTextureRendering(graphics_engine, force_draw);
         GetPainter().PopPaintLayerStack();
-      }
-
-      if (PresentRedirectedView())
-      {
-        unsigned int current_alpha_blend;
-        unsigned int current_src_blend_factor;
-        unsigned int current_dest_blend_factor;
-        // Be a good citizen, get a copy of the current GPU sates according to Nux
-        graphics_engine.GetRenderStates().GetBlend(current_alpha_blend, current_src_blend_factor, current_dest_blend_factor);
-
-        TexCoordXForm texxform;
-        //Geometry xform_geo = GetGraphicsDisplay()->GetGraphicsEngine()->ModelViewXFormRect(GetGeometry());
-        if ((force_draw || draw_cmd_queued_) && background_texture_.IsValid())
+
+        if (GetPresentRedirectedView())
         {
-          graphics_engine.GetRenderStates().SetBlend(false);
-          texxform.FlipVCoord(true);
-          // Draw the background of this view.
-          GetGraphicsDisplay()->GetGraphicsEngine()->QRP_1Tex(GetX(), GetY(), background_texture_->GetWidth(), background_texture_->GetHeight(), background_texture_, texxform, color::White);
+          RedirectedArea ra;
+          ra.backup_texture = backup_texture_;
+          ra.geometry = GetAbsoluteGeometry();
+          ra.clipping_region = graphics_engine.GetClippingRegion();
+          ra.area = this;
+
+          GetWindowCompositor().QueueRedirected(ra);
         }
-
-        texxform.uwrap = TEXWRAP_CLAMP;
-        texxform.vwrap = TEXWRAP_CLAMP;
-        texxform.FlipVCoord(true);
-
-        graphics_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-        GetGraphicsDisplay()->GetGraphicsEngine()->QRP_1Tex(GetX(), GetY(), GetWidth(), GetHeight(), backup_texture_, texxform, Color(color::White));
-        // Be a good citizen, restore the Nux blending states.
-        graphics_engine.GetRenderStates().SetBlend(current_alpha_blend, current_src_blend_factor, current_dest_blend_factor);
+      }
+      else
+      {
+        GatherRedirectedViewForRendering(graphics_engine);
       }
     }
     else
     {
       graphics_engine.PushModelViewMatrix(Get2DMatrix());
+      Matrix4 mat;
+      mat.Translate(GetX(), GetY(), 0);
+      graphics_engine.PushModelViewMatrix(mat);
 
       // Clip against the padding region.
-      Geometry clip_geo = GetGeometry();
+      Geometry clip_geo = GetNativeGeometry();
       clip_geo.OffsetPosition(left_padding_, top_padding_);
       clip_geo.OffsetSize(-left_padding_ - right_padding_, -top_padding_ - bottom_padding_);
 
@@ -589,6 +583,7 @@
 
       graphics_engine.PopClippingRectangle();
       graphics_engine.PopModelViewMatrix();
+      graphics_engine.PopModelViewMatrix();
     }
 
     ResetQueueDraw();
@@ -843,6 +838,28 @@
       QueueDraw();
   }
 
+  void Layout::GatherRedirectedViewForRendering(GraphicsEngine& graphics_engine)
+  {
+    if (IsVisible() && GetRedirectRenderingToTexture() && GetPresentRedirectedView())
+    {
+      // Go through the children of this layout and add redirected view for post-rendering composition.
+      std::list<Area *>::iterator it;
+      for (it = _layout_element_list.begin(); it != _layout_element_list.end(); it++)
+      {
+        (*it)->GatherRedirectedViewForRendering(graphics_engine);
+      }
+
+      RedirectedArea ra;
+      ra.backup_texture = backup_texture_;
+      ra.geometry = GetAbsoluteGeometry();
+      ra.clipping_region = graphics_engine.GetClippingRegion();
+      ra.area = this;
+
+      // Queue this area for post-rendering composition.
+      GetWindowCompositor().QueueRedirected(ra);
+    }
+  }
+
 #ifdef NUX_GESTURES_SUPPORT
   Area* Layout::GetInputAreaHitByGesture(const GestureEvent &event)
   {
 
=== modified file 'Nux/Layout.h'
--- Nux/Layout.h	2012-11-05 21:31:06 +0000
+++ Nux/Layout.h	2012-12-17 15:42:23 +0000
@@ -25,7 +25,7 @@
 
 namespace nux
 {
-
+  class View;
 #define DEBUG_LAYOUT 0
 #define DEBUG_LAYOUT_COMPUTATION 0
 
@@ -256,22 +256,23 @@
 #ifdef NUX_GESTURES_SUPPORT
     virtual Area* GetInputAreaHitByGesture(const GestureEvent &event);
 #endif
-    
+
     /*!
         When a layout goes through Layout::ProcessDraw, this call isn't necessary. Otherwise, call it
         to set the value of draw_cmd_queued_ to false. 
     */
-    virtual void ResetQueueDraw(); 
+    virtual void ResetQueueDraw();
 
   protected:
     void BeginBackupTextureRendering(GraphicsEngine& graphics_engine, bool force_draw);
     void EndBackupTextureRendering(GraphicsEngine& graphics_engine, bool force_draw);
+    virtual void GatherRedirectedViewForRendering(GraphicsEngine& graphics_engine);
 
     virtual void GeometryChangePending(bool position_about_to_change, bool size_about_to_change);
     virtual void GeometryChanged(bool position_has_changed, bool size_has_changed);
 
     virtual bool AcceptKeyNavFocus();
-    
+
     bool draw_cmd_queued_; //<! The rendering of the layout needs to be refreshed.
     bool child_draw_cmd_queued_; //<! A child of this layout has requested a draw.
 
@@ -297,6 +298,7 @@
     std::string m_name;
 
     LayoutContentDistribution m_ContentStacking;
+    friend class View;
   };
 
 
 
=== modified file 'Nux/LinearLayout.h'
--- Nux/LinearLayout.h	2011-10-11 13:55:55 +0000
+++ Nux/LinearLayout.h	2012-12-17 15:42:23 +0000
@@ -33,7 +33,7 @@
     NUX_DECLARE_OBJECT_TYPE(LinearLayout, Layout);
   public:
     virtual void AddLayout(Layout *, unsigned int stretchFactor = 1, MinorDimensionPosition = eAbove, MinorDimensionSize extend = eFull, float percentage = 100.0f, LayoutPosition = NUX_LAYOUT_END);
- 
+
      //! Add an object to the layout.
      /*! Add an object to the layout.
          A baseobject minor dimension with respect to a layout object is the dimension opposite to the layout flow.
@@ -60,7 +60,7 @@
      */
      virtual void AddView(Area *baseobject, unsigned int stretchFactor = 1, MinorDimensionPosition positioning = eAbove, MinorDimensionSize extend = eFull, float percentage = 100.0f, LayoutPosition index = NUX_LAYOUT_END);
      virtual void AddSpace(unsigned int width, unsigned int stretchFactor = 0, LayoutPosition index = NUX_LAYOUT_END);
- 
+
 
     //! Deprecated. Use SetSpaceBetweenChildren;
     void SetHorizontalInternalMargin(int space);
 
=== modified file 'Nux/Makefile.am'
--- Nux/Makefile.am	2012-12-04 19:36:00 +0000
+++ Nux/Makefile.am	2012-12-17 15:42:23 +0000
@@ -113,6 +113,7 @@
   $(srcdir)/RangeValue.cpp \
   $(srcdir)/RangeValueInteger.cpp \
   $(srcdir)/RGBValuator.cpp \
+  $(srcdir)/SceneComposer.cpp \
   $(srcdir)/ScrollBar.cpp \
   $(srcdir)/ScrollView.cpp \
   $(srcdir)/SpinBox.cpp \
@@ -226,6 +227,7 @@
   $(srcdir)/RangeValueInteger.h \
   $(srcdir)/Readme.txt \
   $(srcdir)/RGBValuator.h \
+  $(srcdir)/SceneComposer.h \
   $(srcdir)/ScrollBar.h \
   $(srcdir)/ScrollView.h \
   $(srcdir)/SpinBox.h \
 
=== modified file 'Nux/MenuBar.cpp'
--- Nux/MenuBar.cpp	2012-11-05 21:31:06 +0000
+++ Nux/MenuBar.cpp	2012-12-17 15:42:23 +0000
@@ -89,7 +89,7 @@
 
   void MenuBar::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     graphics_engine.PushClippingRectangle(base);
 
     Geometry item_geometry;
@@ -98,7 +98,8 @@
     for (it = m_MenuBarItemList.begin(); it != m_MenuBarItemList.end(); it++)
     {
       BasicView *area = (*it)->area;
-      item_geometry = area->GetGeometry();
+      item_geometry = area->GetGeometryRelativeTo(this);
+      Geometry ageo = area->GetAbsoluteGeometry();
 
       if (area->IsMouseInside())
       {
@@ -107,12 +108,14 @@
 
         if (!m_MenuIsActive)
         {
-          GetPainter().Paint2DQuadColor(graphics_engine, item_geometry, Color(0xFF000000));
+          //e GetPainter().Paint2DQuadColor(graphics_engine, item_geometry, Color(0xFF000000));
+          GetPainter().Paint2DQuadColor(graphics_engine, ageo, Color(0xFF000000));
           //GetPainter().PaintShape(graphics_engine, item_geometry, Color(0xFF000000), eSHAPE_CORNER_ROUND2);
         }
         else
         {
-          GetPainter().Paint2DQuadColor(graphics_engine, item_geometry, Color(0xFF000000));
+          //e GetPainter().Paint2DQuadColor(graphics_engine, item_geometry, Color(0xFF000000));
+          GetPainter().Paint2DQuadColor(graphics_engine, ageo, Color(0xFF000000));
           //GetPainter().PaintShapeCorner(graphics_engine, item_geometry, Color(0xFF000000), eSHAPE_CORNER_ROUND2,
           //eCornerTopLeft|eCornerTopRight, false);
         }
@@ -127,7 +130,7 @@
         }
         else
         {
-          GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), item_geometry, area->GetBaseString(), GetTextColor(), true, eAlignTextCenter);
+          GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), ageo, area->GetBaseString(), GetTextColor(), true, eAlignTextCenter);
         }
       }
       else
@@ -144,7 +147,7 @@
         }
         else
         {
-          GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), item_geometry, area->GetBaseString(), GetTextColor(), true, eAlignTextCenter);
+          GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), ageo, area->GetBaseString(), GetTextColor(), true, eAlignTextCenter);
         }
       }
     }
@@ -152,9 +155,12 @@
     if (m_MenuIsActive)
     {
       BasicView *area = m_CurrentMenu->area;
-      item_geometry = area->GetGeometry();
+      item_geometry = area->GetGeometryRelativeTo(this);
       GetPainter().PaintBackground(graphics_engine, item_geometry);
-      GetPainter().Paint2DQuadColor(graphics_engine, item_geometry, Color(0xFF000000));
+
+      Geometry ageo = area->GetAbsoluteGeometry();
+
+      GetPainter().Paint2DQuadColor(graphics_engine, ageo, Color(0xFF000000));
       //GetPainter().PaintShapeCorner(graphics_engine, item_geometry, Color(0xFF000000), eSHAPE_CORNER_ROUND2, eCornerTopLeft|eCornerTopRight, true);
 
       if (m_CurrentMenu->icon)
@@ -167,7 +173,7 @@
       }
       else
       {
-        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), item_geometry, area->GetBaseString(), GetTextColor(), true, eAlignTextCenter);
+        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), ageo, area->GetBaseString(), GetTextColor(), true, eAlignTextCenter);
       }
     }
 
@@ -176,7 +182,7 @@
 
   void MenuBar::DrawContent(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    graphics_engine.PushClippingRectangle(GetGeometry());
+    graphics_engine.PushClippingRectangle(GetNativeGeometry());
     graphics_engine.PopClippingRectangle();
   }
 
@@ -334,27 +340,27 @@
 //         // compute window coordinates x and y;
 //         int winx = menubar_item->area->GetBaseX() + x;
 //         int winy = menubar_item->area->GetBaseY() + y;
-// 
+//
 //         for (it = m_MenuBarItemList.begin(); it != m_MenuBarItemList.end(); it++)
 //         {
 //           BasicView *area = (*it)->area;
 //           Geometry geometry = area->GetGeometry();
-// 
+//
 //           if (geometry.IsPointInside(winx, winy))
 //           {
 //             // Close the menu below menubar_item(the one that has the focus
 //             menubar_item->area->ForceStopFocus(0, 0);
-// 
+//
 //             // EmitItemMouseEnter is going to open the menu below(*it)
 //             {
 //               EmitItemMouseEnter(winx, winy, button_flags, key_flags, (*it));
 //               m_IsOpeningMenu = true;
 //               area->ForceStartFocus(0, 0);
-// 
+//
 //               GetWindowThread()->GetWindowCompositor().SetMouseFocusArea(area);
 //               GetWindowThread()->GetWindowCompositor().SetMouseOverArea(area);
 //             }
-// 
+//
 //             break;
 //           }
 //         }
 
=== modified file 'Nux/MenuPage.cpp'
--- Nux/MenuPage.cpp	2012-10-18 22:14:37 +0000
+++ Nux/MenuPage.cpp	2012-12-17 15:42:23 +0000
@@ -60,7 +60,7 @@
   {
     _child_menu     = 0;
     _action_item    = new ActionItem(label, UserValue, NUX_TRACKER_LOCATION);
-    
+
     _pango_static_text = new StaticText(label, NUX_TRACKER_LOCATION);
     _pango_static_text->SetTextColor(Color(0.0f, 0.0f, 0.0f, 1.0f));
   }
@@ -148,7 +148,7 @@
 
   void MenuItem::DrawAsMenuItem(GraphicsEngine &graphics_engine, const Color & /* textcolor */, bool is_highlighted, bool /* isFirstItem */, bool /* isLastItem */, bool /* draw_icone */)
   {
-    Geometry geo = GetGeometry();
+    Geometry geo = GetAbsoluteGeometry();
     Geometry icon_geo(0, 0, 20, 20);
     Geometry text_geo = geo;
 
@@ -208,10 +208,10 @@
 
   void MenuSeparator::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
-    int y0 = base.y + base.GetHeight() / 2;
-    GetPainter().Draw2DLine(graphics_engine, base.x, y0, base.x + base.GetWidth(), y0, Color(0xFF222222));
-    GetPainter().Draw2DLine(graphics_engine, base.x, y0 + 1, base.x + base.GetWidth(), y0 + 1, Color(0xFFAAAAAA));
+    Geometry base = GetAbsoluteGeometry();
+    int y0 = base.y + base.height / 2;
+    GetPainter().Draw2DLine(graphics_engine, base.x, y0, base.x + base.width, y0, Color(0xFF222222));
+    GetPainter().Draw2DLine(graphics_engine, base.x, y0 + 1, base.x + base.width, y0 + 1, Color(0xFFAAAAAA));
   }
 
   MenuPage::MenuPage(const char *title, NUX_FILE_LINE_DECL)
@@ -260,7 +260,7 @@
   MenuPage::~MenuPage()
   {
 //     std::vector <MenuItem*>::iterator it;
-// 
+//
 //     for (it = m_MenuItemVector.begin(); it != m_MenuItemVector.end(); it++)
 //     {
 //       (*it)->UnReference();
@@ -301,7 +301,7 @@
   {
     if (m_IsActive)
     {
-      Geometry base = GetGeometry();
+      Geometry base = GetAbsoluteGeometry();
       Geometry shadow;
       shadow = base;
       shadow.OffsetPosition(4, 4);
@@ -688,7 +688,7 @@
     m_numItem = 0;
     _vlayout->Clear();
     ComputeContentSize();
-   
+
     //FIXME - Hack to fix a bug with the menu height not being reset after removing items
     Geometry base = GetGeometry();
     base.height = 0;
@@ -911,7 +911,7 @@
 
   void MenuPage::StartMenu(int MenuXPosition, int MenuYPosition, int /* x*/, int /* y */, bool /* OverrideCurrentMenuChain */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetAbsoluteGeometry();
     base.SetX(MenuXPosition);
     base.SetY(MenuYPosition);
 
 
=== modified file 'Nux/NumericValuator.cpp'
--- Nux/NumericValuator.cpp	2012-10-10 22:46:50 +0000
+++ Nux/NumericValuator.cpp	2012-12-17 15:42:23 +0000
@@ -74,13 +74,13 @@
 
   void NumericValuator::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
 
     GeometryPositioning gp(eHALeft, eVACenter);
-    Geometry GeoPo = ComputeGeometryPositioning(m_SpinnerUpBtn->GetGeometry(), GetTheme().GetImageGeometry(eTRIANGLE_RIGHT), gp);
+    Geometry GeoPo = ComputeGeometryPositioning(m_SpinnerUpBtn->GetGeometryRelativeTo(this), GetTheme().GetImageGeometry(eTRIANGLE_RIGHT), gp);
     GetPainter().PaintShape(graphics_engine, GeoPo, Color(0xFFFFFFFF), eTRIANGLE_RIGHT);
 
-    GeoPo = ComputeGeometryPositioning(m_SpinnerDownBtn->GetGeometry(), GetTheme().GetImageGeometry(eTRIANGLE_LEFT), gp);
+    GeoPo = ComputeGeometryPositioning(m_SpinnerDownBtn->GetGeometryRelativeTo(this), GetTheme().GetImageGeometry(eTRIANGLE_LEFT), gp);
     GetPainter().PaintShape(graphics_engine, GeoPo, Color(0xFFFFFFFF), eTRIANGLE_LEFT);
 
     m_EditLine->QueueDraw();
 
=== modified file 'Nux/PaintLayer.cpp'
--- Nux/PaintLayer.cpp	2012-11-05 21:31:06 +0000
+++ Nux/PaintLayer.cpp	2012-12-17 15:42:23 +0000
@@ -50,7 +50,7 @@
     graphics_engine.GetRenderStates().GetColorMask(current_red_mask, current_green_mask, current_blue_mask, current_alpha_mask);
     // Get the current blend states. They will be restored later.
     graphics_engine.GetRenderStates().GetBlend(current_alpha_blend, current_src_blend_factor, current_dest_blend_factor);
-    
+
     graphics_engine.GetRenderStates().SetColorMask(GL_TRUE, GL_TRUE, GL_TRUE, m_write_alpha ? GL_TRUE : GL_FALSE);
     graphics_engine.GetRenderStates().SetBlend(m_rop.Blend, m_rop.SrcBlend, m_rop.DstBlend);
     graphics_engine.QRP_Color(geometry_.x, geometry_.y, geometry_.GetWidth(), geometry_.GetHeight(), _color);
@@ -135,7 +135,7 @@
   }
 
 /////////////////////////////////////////////////////
-  
+
   CompositionLayer::CompositionLayer (ObjectPtr <IOpenGLBaseTexture> texture0, TexCoordXForm texxform0, const Color& color0,
     ObjectPtr <IOpenGLBaseTexture> texture1, TexCoordXForm texxform1, const Color& color1,
     LayerBlendMode layer_blend_mode, bool write_alpha, const ROPConfig& ROP)
@@ -179,7 +179,7 @@
   }
 
   CompositionLayer::CompositionLayer(const Color& base_color, const Color& blend_color, LayerBlendMode layer_blend_mode,
-    bool write_alpha, const ROPConfig& ROP) 
+    bool write_alpha, const ROPConfig& ROP)
     : m_source_color(base_color),
       m_foreground_color(blend_color),
       m_write_alpha(write_alpha),
@@ -205,14 +205,14 @@
     unsigned int current_green_mask;
     unsigned int current_blue_mask;
     unsigned int current_alpha_mask;
-    
+
     // Get the current color mask and blend states. They will be restored later.
     graphics_engine.GetRenderStates().GetColorMask(current_red_mask, current_green_mask, current_blue_mask, current_alpha_mask);
     graphics_engine.GetRenderStates().GetBlend(current_alpha_blend, current_src_blend_factor, current_dest_blend_factor);
 
     graphics_engine.GetRenderStates().SetColorMask(GL_TRUE, GL_TRUE, GL_TRUE, m_write_alpha ? GL_TRUE : GL_FALSE);
     graphics_engine.GetRenderStates().SetBlend(m_rop.Blend, m_rop.SrcBlend, m_rop.DstBlend);
-    
+
     if (m_source_texture.IsValid())
     {
         if (m_foreground_texture.IsValid())
@@ -268,7 +268,7 @@
     m_color_blend_mode(LAYER_BLEND_MODE_LAST)
   {
   }
-  
+
   TextureLayer::TextureLayer(ObjectPtr<IOpenGLBaseTexture> device_texture, TexCoordXForm texxform, const Color& color0,
     bool write_alpha, const ROPConfig& ROP, const Color& blend_color, LayerBlendMode color_blend_mode)
     : m_device_texture(device_texture),
 
=== modified file 'Nux/Panel.cpp'
--- Nux/Panel.cpp	2012-10-26 10:49:31 +0000
+++ Nux/Panel.cpp	2012-12-17 15:42:23 +0000
@@ -52,13 +52,13 @@
 
   void Panel::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
   {
-    graphics_engine.PushClippingRectangle(GetGeometry());
+    graphics_engine.PushClippingRectangle(GetNativeGeometry());
 
     graphics_engine.PushClippingRectangle(Rect(m_ViewX, m_ViewY, m_ViewWidth, m_ViewHeight));
 
     if (m_layout)
     {
-      graphics_engine.PushClippingRectangle(m_layout->GetGeometry());
+      graphics_engine.PushClippingRectangle(m_layout->GetNativeGeometry());
       m_layout->ProcessDraw(graphics_engine, force_draw);
       graphics_engine.PopClippingRectangle();
     }
 
=== modified file 'Nux/RGBValuator.cpp'
--- Nux/RGBValuator.cpp	2012-11-05 21:31:06 +0000
+++ Nux/RGBValuator.cpp	2012-12-17 15:42:23 +0000
@@ -300,10 +300,11 @@
     if (m_color_model == color::HLS)
       percent = hls_.hue;
 
-    graphics_engine.PushClippingRectangle(red_valuator_->GetGeometry());
+    Geometry relative_geo = red_valuator_->GetGeometryRelativeTo(this);
+    graphics_engine.PushClippingRectangle(relative_geo);
 
-    marker_position_x = red_valuator_->GetBaseX() + percent * red_valuator_->GetBaseWidth();
-    marker_position_y = red_valuator_->GetBaseY() + red_valuator_->GetBaseHeight();
+    marker_position_x = relative_geo.x + percent * red_valuator_->GetBaseWidth();
+    marker_position_y = relative_geo.y + red_valuator_->GetBaseHeight();
     GetPainter().Draw2DTriangleColor(graphics_engine, marker_position_x - 5, marker_position_y,
                                   marker_position_x, marker_position_y - 5,
                                   marker_position_x + 5, marker_position_y, Color(0xFF000000));
@@ -331,10 +332,11 @@
     if (m_color_model == color::HLS)
       percent = hls_.lightness;
 
-    graphics_engine.PushClippingRectangle(green_valuator_->GetGeometry());
+    Geometry relative_geo = green_valuator_->GetGeometryRelativeTo(this);
+    graphics_engine.PushClippingRectangle(relative_geo);
 
-    marker_position_x = green_valuator_->GetBaseX() + percent * green_valuator_->GetBaseWidth();
-    marker_position_y = green_valuator_->GetBaseY() + green_valuator_->GetBaseHeight();
+    marker_position_x = relative_geo.x + percent * green_valuator_->GetBaseWidth();
+    marker_position_y = relative_geo.y + green_valuator_->GetBaseHeight();
     GetPainter().Draw2DTriangleColor(graphics_engine, marker_position_x - 5, marker_position_y,
                                   marker_position_x, marker_position_y - 5,
                                   marker_position_x + 5, marker_position_y, Color(0.0f, 0.0f, 0.0f, 1.0f));
@@ -362,10 +364,11 @@
     if (m_color_model == color::HLS)
       percent = hls_.saturation;
 
-    graphics_engine.PushClippingRectangle(blue_valuator_->GetGeometry());
+    Geometry relative_geo = blue_valuator_->GetGeometryRelativeTo(this);
+    graphics_engine.PushClippingRectangle(relative_geo);
 
-    marker_position_x = blue_valuator_->GetBaseX() + percent * blue_valuator_->GetBaseWidth();
-    marker_position_y = blue_valuator_->GetBaseY() + blue_valuator_->GetBaseHeight();
+    marker_position_x = relative_geo.x + percent * blue_valuator_->GetBaseWidth();
+    marker_position_y = relative_geo.y + blue_valuator_->GetBaseHeight();
     GetPainter().Draw2DTriangleColor(graphics_engine, marker_position_x - 5, marker_position_y,
                                   marker_position_x, marker_position_y - 5,
                                   marker_position_x + 5, marker_position_y, Color(0.0f, 0.0f, 0.0f, 1.0f));
@@ -382,10 +385,11 @@
     int marker_position_x;
     int marker_position_y;
 
-    graphics_engine.PushClippingRectangle(alpha_valuator_->GetGeometry());
+    Geometry relative_geo = alpha_valuator_->GetGeometryRelativeTo(this);
+    graphics_engine.PushClippingRectangle(relative_geo);
 
-    marker_position_x = alpha_valuator_->GetBaseX() + alpha_ * alpha_valuator_->GetBaseWidth();
-    marker_position_y = alpha_valuator_->GetBaseY() + alpha_valuator_->GetBaseHeight();
+    marker_position_x = relative_geo.x + alpha_ * alpha_valuator_->GetBaseWidth();
+    marker_position_y = relative_geo.y + alpha_valuator_->GetBaseHeight();
     GetPainter().Draw2DTriangleColor(graphics_engine, marker_position_x - 5, marker_position_y,
                                   marker_position_x, marker_position_y - 5,
                                   marker_position_x + 5, marker_position_y, Color(0.0f, 0.0f, 0.0f, 1.0f));
@@ -399,10 +403,37 @@
 
   void RGBValuator::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
-
-    graphics_engine.PushClippingRectangle(base);
-    GetPainter().PushDrawShapeLayer(graphics_engine, vlayout->GetGeometry(), eSHAPE_CORNER_ROUND4, Color(0xFF000000), eAllCorners, true);
+    Geometry base = GetNativeGeometry();
+
+    // Set clipping region for this view
+    graphics_engine.PushClippingRectangle(base);
+
+    // Draw rounded rectangle background.
+    GetPainter().PaintShape(graphics_engine, vlayout->GetGeometry(), Color(0xFF000000), eSHAPE_CORNER_ROUND4, true);
+
+    graphics_engine.PopClippingRectangle();
+  }
+
+  void RGBValuator::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
+  {
+    Geometry base = GetNativeGeometry();
+    // Set clipping region for this view
+    graphics_engine.PushClippingRectangle(base);
+
+    GetPainter().PushShapeLayer(graphics_engine, vlayout->GetGeometry(), eSHAPE_CORNER_ROUND4, Color(0xFF000000), eAllCorners, true);
+
+    // Draw the widgets inside this view. BasicView widget don't do any drawing.
+    GetLayout()->ProcessDraw(graphics_engine, force_draw);
+
+    // Draw BasicViews and other elements
+    Geometry relative_geo = m_ComponentLabel0->GetGeometryRelativeTo(this);
+    GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), relative_geo, m_ComponentLabel0->GetBaseString(), Color(0xFFFFFFFF));
+    relative_geo = m_ComponentLabel1->GetGeometryRelativeTo(this);
+    GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), relative_geo, m_ComponentLabel1->GetBaseString(), Color(0xFFFFFFFF));
+    relative_geo = m_ComponentLabel2->GetGeometryRelativeTo(this);
+    GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), relative_geo, m_ComponentLabel2->GetBaseString(), Color(0xFFFFFFFF));
+    relative_geo = m_ComponentAlpha->GetGeometryRelativeTo(this);
+    GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), relative_geo, m_ComponentAlpha->GetBaseString(), Color(0xFFFFFFFF));
 
     if (m_color_model == color::RGB)
     {
@@ -417,11 +448,6 @@
       DrawHLS(graphics_engine);
     }
 
-    GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), m_ComponentLabel0->GetGeometry(), m_ComponentLabel0->GetBaseString(), Color(0xFFFFFFFF));
-    GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), m_ComponentLabel1->GetGeometry(), m_ComponentLabel1->GetBaseString(), Color(0xFFFFFFFF));
-    GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), m_ComponentLabel2->GetGeometry(), m_ComponentLabel2->GetBaseString(), Color(0xFFFFFFFF));
-    GetPainter().PaintTextLineStatic(graphics_engine, GetSysBoldFont(), m_ComponentAlpha->GetGeometry(), m_ComponentAlpha->GetBaseString(), Color(0xFFFFFFFF));
-
     DrawRedMarker(graphics_engine);
     DrawGreenMarker(graphics_engine);
     DrawBlueMarker(graphics_engine);
@@ -431,40 +457,25 @@
     graphics_engine.PopClippingRectangle();
   }
 
-  void RGBValuator::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
-  {
-    Geometry base = GetGeometry();
-    graphics_engine.PushClippingRectangle(base);
-
-    red_caption_->ProcessDraw(graphics_engine, force_draw);
-    green_caption_->ProcessDraw(graphics_engine, force_draw);
-    blue_caption_->ProcessDraw(graphics_engine, force_draw);
-    alpha_caption_->ProcessDraw(graphics_engine, force_draw);
-
-    m_ColorModel->ProcessDraw(graphics_engine, force_draw); // the button has round corner. That is why we need to push the background.
-    m_ColorFormat->ProcessDraw(graphics_engine, force_draw); // the button has round corner. That is why we need to push the background.
-    graphics_engine.PopClippingRectangle();
-  }
-
   void RGBValuator::DrawRGB(GraphicsEngine &graphics_engine)
   {
     // Red
-    Geometry P = red_valuator_->GetGeometry();
+    Geometry P = red_valuator_->GetGeometryRelativeTo(this);
     GetPainter().Paint2DQuadColor(graphics_engine, P, Color(0.0f, rgb_.green, rgb_.blue), Color(0.0f, rgb_.green, rgb_.blue),
                                Color(1.0f, rgb_.green, rgb_.blue), Color(1.0f, rgb_.green, rgb_.blue));
 
     // Green
-    P = green_valuator_->GetGeometry();
+    P = green_valuator_->GetGeometryRelativeTo(this);
     GetPainter().Paint2DQuadColor(graphics_engine, P, Color(rgb_.red, 0.0f, rgb_.blue), Color(rgb_.red, 0.0f, rgb_.blue),
                                Color(rgb_.red, 1.0f, rgb_.blue), Color(rgb_.red, 1.0f, rgb_.blue));
 
     // Blue
-    P = blue_valuator_->GetGeometry();
+    P = blue_valuator_->GetGeometryRelativeTo(this);
     GetPainter().Paint2DQuadColor(graphics_engine, P, Color(rgb_.red, rgb_.green, 0.0f), Color(rgb_.red, rgb_.green, 0.0f),
                                Color(rgb_.red, rgb_.green, 1.0f), Color(rgb_.red, rgb_.green, 1.0f));
 
     // Alpha
-    P = alpha_valuator_->GetGeometry();
+    P = alpha_valuator_->GetGeometryRelativeTo(this);
     m_CheckboardLayer->SetGeometry(P);
     m_CheckboardLayer->Renderlayer(graphics_engine);
 
@@ -473,18 +484,15 @@
                                Color(rgb_.red, rgb_.green, rgb_.blue, 1.0f), Color(rgb_.red, rgb_.green, rgb_.blue, 1.0f));
     graphics_engine.GetRenderStates().SetBlend(false);
 
-    P = color_square_->GetGeometry();
+    P = color_square_->GetGeometryRelativeTo(this);
     GetPainter().Paint2DQuadColor(graphics_engine, P, Color(rgb_.red, rgb_.green, rgb_.blue), Color(rgb_.red, rgb_.green, rgb_.blue),
                                Color(rgb_.red, rgb_.green, rgb_.blue), Color(rgb_.red, rgb_.green, rgb_.blue));
-
-    m_ColorModel->ProcessDraw(graphics_engine, true);
-    m_ColorFormat->ProcessDraw(graphics_engine, true);
   }
 
   void RGBValuator::DrawHSV(GraphicsEngine &graphics_engine)
   {
     // Red
-    Geometry P = red_valuator_->GetGeometry();
+    Geometry P = red_valuator_->GetGeometryRelativeTo(this);
     float s = 0; //XSI: 1.0f - hsv_.saturation;
     float v = 1; //XSI: hsv_.value;
     float fw = P.GetWidth() / 6;
@@ -516,18 +524,18 @@
     Color value_gray(v, v, v);
     Color value_color(Color(rgb) * v);
     // Green
-    P = green_valuator_->GetGeometry();
+    P = green_valuator_->GetGeometryRelativeTo(this);
     GetPainter().Paint2DQuadColor(graphics_engine, P, value_gray, value_gray, value_color, value_color);
 
     rgb = color::RedGreenBlue(color::HueSaturationValue(hue, hsv_.saturation, 1));
     // Blue
-    P = blue_valuator_->GetGeometry();
+    P = blue_valuator_->GetGeometryRelativeTo(this);
     GetPainter().Paint2DQuadColor(graphics_engine, P, color::Black, color::Black, Color(rgb), Color(rgb));
 
     rgb = color::RedGreenBlue(color::HueSaturationValue(hue, hsv_.saturation, hsv_.value));
 
     // Alpha
-    P = alpha_valuator_->GetGeometry();
+    P = alpha_valuator_->GetGeometryRelativeTo(this);
     m_CheckboardLayer->SetGeometry(P);
     m_CheckboardLayer->Renderlayer(graphics_engine);
 
@@ -535,17 +543,14 @@
     GetPainter().Paint2DQuadColor(graphics_engine, P, Color(0.0f, 0.0f, 0.0f, 0.0f), Color(0.0f, 0.0f, 0.0f, 0.0f), Color(rgb), Color(rgb));
     graphics_engine.GetRenderStates().SetBlend(false);
 
-    P = color_square_->GetGeometry();
+    P = color_square_->GetGeometryRelativeTo(this);
     GetPainter().Paint2DQuadColor(graphics_engine, P, Color(rgb));
-
-    m_ColorModel->ProcessDraw(graphics_engine, true);
-    m_ColorFormat->ProcessDraw(graphics_engine, true);
   }
 
   void RGBValuator::DrawHLS(GraphicsEngine &graphics_engine)
   {
     // Red
-    Geometry P = red_valuator_->GetGeometry();
+    Geometry P = red_valuator_->GetGeometryRelativeTo(this);
     float s = 0; //XSI: 1.0f - hls_.saturation;
     float l = 1; //XSI: hls_.lightness;
     float fw = P.GetWidth() / 6;
@@ -585,7 +590,7 @@
     float b = rgb.blue;
 
     // Green
-    P = green_valuator_->GetGeometry();
+    P = green_valuator_->GetGeometryRelativeTo(this);
     fw = P.GetWidth() / 2;
     p = Geometry(P.x, P.y, fw, P.GetHeight());
     GetPainter().Paint2DQuadColor(graphics_engine, p, Color(0.0f, 0.0f, 0.0f), Color(0.0f, 0.0f, 0.0f), Color(r* (1 - s) + 0.5f * s, g* (1 - s) + 0.5f * s, b* (1 - s) + 0.5f * s), Color(r* (1 - s) + 0.5f * s, g* (1 - s) + 0.5f * s, b* (1 - s) + 0.5f * s));
@@ -612,7 +617,7 @@
       cb = (factor) * b * (1 - s) + 0.5 * s;
     }
 
-    P = blue_valuator_->GetGeometry();
+    P = blue_valuator_->GetGeometryRelativeTo(this);
     GetPainter().Paint2DQuadColor(graphics_engine, P, Color(l, l, l), Color(l, l, l), Color(cr, cg, cb), Color(cr, cg, cb));
 
     // TODO: Tim Penhey 2011-05-13
@@ -620,7 +625,7 @@
     rgb = color::RedGreenBlue(hls_);
 
     // Alpha
-    P = alpha_valuator_->GetGeometry();
+    P = alpha_valuator_->GetGeometryRelativeTo(this);
     m_CheckboardLayer->SetGeometry(P);
     m_CheckboardLayer->Renderlayer(graphics_engine);
 
@@ -628,11 +633,8 @@
     GetPainter().Paint2DQuadColor(graphics_engine, P, Color(0.0f, 0.0f, 0.0f, 0.0f), Color(0.0f, 0.0f, 0.0f, 0.0f), Color(rgb), Color(rgb));
     graphics_engine.GetRenderStates().SetBlend(false);
 
-    P = color_square_->GetGeometry();
+    P = color_square_->GetGeometryRelativeTo(this);
     GetPainter().Paint2DQuadColor(graphics_engine, P, Color(rgb));
-
-    m_ColorModel->ProcessDraw(graphics_engine, true);
-    m_ColorFormat->ProcessDraw(graphics_engine, true);
   }
 
   void RGBValuator::SetRGBA(Color const& color)
 
=== modified file 'Nux/RadioButton.cpp'
--- Nux/RadioButton.cpp	2012-11-05 21:31:06 +0000
+++ Nux/RadioButton.cpp	2012-12-17 15:42:23 +0000
@@ -29,7 +29,7 @@
 namespace nux
 {
   NUX_IMPLEMENT_OBJECT_TYPE(RadioButton);
-  
+
   RadioButton::RadioButton(const std::string& str, bool state, NUX_FILE_LINE_DECL)
   : AbstractCheckedButton(str, state, NUX_FILE_LINE_PARAM)
   {
@@ -53,7 +53,7 @@
 
   void RadioButton::Draw(GraphicsEngine& graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     graphics_engine.PushClippingRectangle(base);
 
     InteractState is;
@@ -73,13 +73,11 @@
       is.is_prelight = false;
     }
 
-    GetPainter().PushPaintLayerStack();
     {
-      GetPainter().PaintRadioButton(graphics_engine, check_area_->GetGeometry(), is, Color(0xff000000));
+      GetPainter().PaintRadioButton(graphics_engine, check_area_->GetGeometryRelativeTo(this), is, Color(0xff000000));
       static_text_->ProcessDraw(graphics_engine, true);
     }
-    GetPainter().PopPaintLayerStack();
-  
+
     graphics_engine.PopClippingRectangle();
   }
 
 
=== modified file 'Nux/RangeValue.cpp'
--- Nux/RangeValue.cpp	2012-11-05 21:31:06 +0000
+++ Nux/RangeValue.cpp	2012-12-17 15:42:23 +0000
@@ -97,7 +97,7 @@
     int marker_position_x;
     int marker_position_y;
 
-    graphics_engine.PushClippingRectangle(m_Percentage->GetGeometry());
+    graphics_engine.PushClippingRectangle(m_Percentage->GetGeometryRelativeTo(this));
 
     marker_position_x = m_Percentage->GetBaseX() + (m_Value - m_min) * m_Percentage->GetBaseWidth() * 1 / (m_max - m_min);
     marker_position_y = m_Percentage->GetBaseY() + m_Percentage->GetBaseHeight();
@@ -115,10 +115,10 @@
 
   void RangeValue::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
 
     // Percentage
-    Geometry P = m_Percentage->GetGeometry();
+    Geometry P = m_Percentage->GetGeometryRelativeTo(this);
     GetPainter().Paint2DQuadColor(graphics_engine, P, m_StartColor, m_StartColor, m_EndColor, m_EndColor);
 
     if (m_EnableDrawProgress)
 
=== modified file 'Nux/RangeValueInteger.cpp'
--- Nux/RangeValueInteger.cpp	2012-11-05 21:31:06 +0000
+++ Nux/RangeValueInteger.cpp	2012-12-17 15:42:23 +0000
@@ -96,7 +96,7 @@
     int marker_position_x;
     int marker_position_y;
 
-    graphics_engine.PushClippingRectangle(m_Percentage->GetGeometry());
+    graphics_engine.PushClippingRectangle(m_Percentage->GetGeometryRelativeTo(this));
 
     marker_position_x = m_Percentage->GetBaseX() + (m_MarkerPosition - m_min) * m_Percentage->GetBaseWidth() * 1 / (m_max - m_min);
     marker_position_y = m_Percentage->GetBaseY() + m_Percentage->GetBaseHeight();
@@ -113,10 +113,10 @@
 
   void RangeValueInteger::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
 
     // Percentage
-    Geometry P = m_Percentage->GetGeometry();
+    Geometry P = m_Percentage->GetGeometryRelativeTo(this);
     GetPainter().Paint2DQuadColor(graphics_engine, P, m_StartColor, m_StartColor, m_EndColor, m_EndColor);
 
     if (m_EnableDrawProgress)
 
=== added file 'Nux/SceneComposer.cpp'
--- Nux/SceneComposer.cpp	1970-01-01 00:00:00 +0000
+++ Nux/SceneComposer.cpp	2012-12-17 15:42:23 +0000
@@ -0,0 +1,111 @@
+/*
+ * Copyright 2012 Inalogic® Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License, as
+ * published by the  Free Software Foundation; either version 2.1 or 3.0
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the applicable version of the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of both the GNU Lesser General Public
+ * License along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Jay Taoko <[e-mail]>
+ *
+ */
+
+#include "NuxGraphics/GraphicsEngine.h"
+#include "Nux.h"
+#include "SceneComposer.h"
+
+namespace nux
+{
+
+SceneComposer::SceneComposer()
+: graphics_engine_(NULL)
+, gpu_device_(NULL)
+, dst_texture_width(0)
+, dst_texture_height(0)
+{
+
+}
+
+SceneComposer::~SceneComposer()
+{
+
+}
+
+void SceneComposer::SetGraphicsObjects(GraphicsEngine* graphics_engine, GpuDevice* gpu_device)
+{
+  graphics_engine_ = graphics_engine;
+  gpu_device_ = gpu_device;
+}
+
+void SceneComposer::SetDestinationTexture(ObjectPtr<IOpenGLBaseTexture> rendering_surface_texture)
+{
+  rendering_surface_texture_ = rendering_surface_texture;
+}
+
+void SceneComposer::SetOrthoGraphicProjection()
+{
+  if (rendering_surface_texture_.IsValid())
+  {
+    dst_texture_width = rendering_surface_texture_->GetWidth();
+    dst_texture_height = rendering_surface_texture_->GetHeight();
+
+    if (fbo_.IsNull())
+    {
+      // Create the fbo before using it for the first time.
+      fbo_ = GetGraphicsDisplay()->GetGpuDevice()->CreateFrameBufferObject();
+    }
+
+    fbo_->FormatFrameBufferObject(dst_texture_width, dst_texture_height, rendering_surface_texture_->GetPixelFormat());
+    fbo_->SetTextureAttachment(0, rendering_surface_texture_, 0);
+    fbo_->SetDepthTextureAttachment(ObjectPtr<IOpenGLBaseTexture>(0), 0);
+    fbo_->Activate();
+
+    // Drawing to a texture!
+
+    graphics_engine_->EmptyClippingRegion();
+    graphics_engine_->SetOpenGLClippingRectangle(0, 0, dst_texture_width, dst_texture_height);
+    graphics_engine_->SetViewport(0, 0, dst_texture_width, dst_texture_height);
+    graphics_engine_->SetOrthographicProjectionMatrix(dst_texture_width, dst_texture_height);
+  }
+  else
+  {
+    // Whatever frame buffer is actevated, de-activate it.
+    gpu_device_->DeactivateFrameBuffer();
+
+    // Drawing to the backbuffer!
+
+    dst_texture_width = graphics_engine_->GetWindowWidth();
+    dst_texture_height = graphics_engine_->GetWindowHeight();
+    graphics_engine_->EmptyClippingRegion();
+    graphics_engine_->SetOpenGLClippingRectangle(0, 0, dst_texture_width, dst_texture_height);
+    graphics_engine_->SetViewport(0, 0, dst_texture_width, dst_texture_height);
+    graphics_engine_->SetOrthographicProjectionMatrix(dst_texture_width, dst_texture_height);
+  }
+}
+
+void SceneComposer::RenderTexture(ObjectPtr<IOpenGLBaseTexture> texture, Geometry geo, Geometry clip, float opacity, bool blend)
+{
+  if (graphics_engine_ == NULL)
+    return;
+
+  if (texture.IsNull())
+    return;
+
+  TexCoordXForm texxform0;
+  texxform0.FlipVCoord(true);
+
+  graphics_engine_->QRP_1Tex(geo.x, geo.y, geo.width, geo.height, texture, texxform0, Color(1.0f, 1.0f, 1.0f, opacity));
+}
+
+
+};
+
 
=== added file 'Nux/SceneComposer.h'
--- Nux/SceneComposer.h	1970-01-01 00:00:00 +0000
+++ Nux/SceneComposer.h	2012-12-17 15:42:23 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2012 Inalogic® Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License, as
+ * published by the  Free Software Foundation; either version 2.1 or 3.0
+ * of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the applicable version of the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of both the GNU Lesser General Public
+ * License along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Jay Taoko <[e-mail]>
+ *
+ */
+
+#ifndef SCENE_COMPOSER_H
+#define SCENE_COMPOSER_H
+
+namespace nux
+{
+
+//! SceneComposer does the final composition of the rendering.
+class SceneComposer
+{
+public:
+  SceneComposer();
+  ~SceneComposer();
+
+  //! Set the destination texture
+  /*!
+      If the texture is NULL, the destination is the back-buffer.
+      @param destination_texture Surface to render into.
+  */
+  void SetDestinationTexture(ObjectPtr<IOpenGLBaseTexture> destination_texture);
+
+  /*!
+      Set the graphics objects to use for the rendering.
+      @param graphics_engine The graphics engine to use.
+      @param gpu_device The gpu device engine to use.
+  */
+  void SetGraphicsObjects(GraphicsEngine* graphics_engine, GpuDevice* gpu_device);
+
+  /*!
+      Renders a texture on the destination surface.
+      @param texture Texture to render.
+      @param geo The quad geometry.
+      @param clip Clipping region.
+      @param opacity.
+      @param premultiply.
+  */
+  void RenderTexture(ObjectPtr<IOpenGLBaseTexture> texture, Geometry geo, Geometry clip, float opacity = 1.0f, bool premultiply = false);
+
+  /*!
+      Set the rendering matrices before drawing.
+  */
+  void SetOrthoGraphicProjection();
+
+private:
+  ObjectPtr<IOpenGLBaseTexture> rendering_surface_texture_;
+  ObjectPtr<IOpenGLFrameBufferObject> fbo_;
+
+  GraphicsEngine* graphics_engine_;
+  GpuDevice* gpu_device_;
+  int dst_texture_width;
+  int dst_texture_height;
+
+};
+
+}
+
+#endif // SCENE_COMPOSER_H
+
 
=== modified file 'Nux/ScrollView.cpp'
--- Nux/ScrollView.cpp	2012-11-05 21:31:06 +0000
+++ Nux/ScrollView.cpp	2012-12-17 15:42:23 +0000
@@ -102,7 +102,6 @@
                                                        &ScrollView::ScrollDown));
       _vscrollbar->mouse_wheel.connect(sigc::mem_fun(this,
                                                      &ScrollView::RecvMouseWheel));
-      
       _vscrollbar->UnReference();
     }
 
@@ -140,11 +139,14 @@
     if (child->IsLayout())
       return;
 
-    int child_y = child->GetGeometry().y - GetGeometry().y;
+    Geometry cgeo = child->GetNativeGeometry();
+    Geometry base = GetGeometryRelativeTo(this);
+
+    int child_y = cgeo.y - base.y;
     int child_y_diff = child_y - abs(_delta_y);
 
 
-    if (child_y_diff + child->GetGeometry().height < GetGeometry().height && child_y_diff >= 0)
+    if (child_y_diff + cgeo.height < base.height && child_y_diff >= 0)
     {
       return;
     }
@@ -155,10 +157,10 @@
     }
     else
     {
-      int size = child_y_diff - GetGeometry().height;
+      int size = child_y_diff - base.height;
 
       // always keeps the top of a view on the screen
-      size += (child->GetGeometry().height, GetGeometry().height) ? child->GetGeometry().height : GetGeometry().height;
+      size += (cgeo.height, base.height) ? cgeo.height : base.height;
 
       ScrollDown(1, size);
     }
@@ -218,9 +220,9 @@
 
   void ScrollView::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    graphics_engine.PushClippingRectangle(GetGeometry());
+    graphics_engine.PushClippingRectangle(GetNativeGeometry());
 
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
 
     if (view_layout_)
       view_layout_->QueueDraw();
@@ -244,8 +246,8 @@
   {
     if (IsFullRedraw())
       GetPainter().PushBackgroundStack();
-      
-    graphics_engine.PushClippingRectangle(GetGeometry());
+
+    graphics_engine.PushClippingRectangle(GetNativeGeometry());
 
     graphics_engine.PushClippingRectangle(Rect(m_ViewX, m_ViewY, m_ViewWidth, m_ViewHeight));
 
@@ -306,7 +308,7 @@
   void ScrollView::FormatContent()
   {
     Geometry geo;
-    geo = GetGeometry();
+    geo = GetNativeGeometry();
 
     ComputeContentSize();
   }
@@ -315,15 +317,15 @@
   {
     // Give the managed layout the same size and position as the Control.
 
-    Geometry geo = GetGeometry();
+    Geometry geo = GetNativeGeometry();
     int ScrollBarWidth = _vscrollbar->GetBaseWidth();
     int ScrollBarHeight = _hscrollbar->GetBaseHeight();
 
     nuxAssertMsg(ScrollBarWidth > 0, "[ScrollView::PreLayoutManagement] Invalid scrollbar width: %d", ScrollBarWidth);
     nuxAssertMsg(ScrollBarHeight > 0, "[ScrollView::PreLayoutManagement] Invalid scrollbar height: %d", ScrollBarHeight);
 
-    m_ViewX = GetBaseX() + m_border + m_ViewContentLeftMargin;
-    m_ViewY = GetBaseY() + m_top_border + m_ViewContentTopMargin;
+    m_ViewX = GetNativeX() + m_border + m_ViewContentLeftMargin;
+    m_ViewY = GetNativeY() + m_top_border + m_ViewContentTopMargin;
 
     if (m_vertical_scrollbar_enable == false)
       m_ViewWidth = GetBaseWidth() - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin;
@@ -443,8 +445,8 @@
     if (m_vertical_scrollbar_enable)
       ScrollBarWidth = _vscrollbar->GetBaseWidth();
 
-    _hscrollbar->SetContainerSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
-                                  GetBaseY() + m_top_border + m_ViewContentTopMargin,
+    _hscrollbar->SetContainerSize(GetNativeX() + m_border + m_ViewContentLeftMargin,
+                                  GetNativeY() + m_top_border + m_ViewContentTopMargin,
                                   GetBaseWidth() - ScrollBarWidth - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin,
                                   GetBaseHeight() - ScrollBarHeight - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin);
 
@@ -457,21 +459,21 @@
       }
       else
       {
-        _hscrollbar->SetContentSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
-                                    GetBaseY() + m_top_border + m_ViewContentTopMargin, 0, 0);
+        _hscrollbar->SetContentSize(GetNativeX() + m_border + m_ViewContentLeftMargin,
+                                    GetNativeY() + m_top_border + m_ViewContentTopMargin, 0, 0);
       }
 
       _hscrollbar->SetContentOffset(_delta_x, _delta_y);
     }
     else
     {
-      _hscrollbar->SetContentSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
-                                  GetBaseY() + m_top_border + m_ViewContentTopMargin, 0, 0);
+      _hscrollbar->SetContentSize(GetNativeX() + m_border + m_ViewContentLeftMargin,
+                                  GetNativeY() + m_top_border + m_ViewContentTopMargin, 0, 0);
       _hscrollbar->SetContentOffset(0, 0);
     }
 
-    _vscrollbar->SetContainerSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
-                                  GetBaseY() + m_top_border + m_ViewContentTopMargin,
+    _vscrollbar->SetContainerSize(GetNativeX() + m_border + m_ViewContentLeftMargin,
+                                  GetNativeY() + m_top_border + m_ViewContentTopMargin,
                                   GetBaseWidth() - ScrollBarWidth - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin,
                                   GetBaseHeight() - ScrollBarHeight - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin);
 
@@ -484,16 +486,16 @@
       }
       else
       {
-        _vscrollbar->SetContentSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
-                                    GetBaseY() + m_top_border + m_ViewContentTopMargin, 0, 0);
+        _vscrollbar->SetContentSize(GetNativeX() + m_border + m_ViewContentLeftMargin,
+                                    GetNativeY() + m_top_border + m_ViewContentTopMargin, 0, 0);
       }
 
       _vscrollbar->SetContentOffset(_delta_x, _delta_y);
     }
     else
     {
-      _vscrollbar->SetContentSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
-                                  GetBaseY() + m_top_border + m_ViewContentTopMargin, 0, 0);
+      _vscrollbar->SetContentSize(GetNativeX() + m_border + m_ViewContentLeftMargin,
+                                  GetNativeY() + m_top_border + m_ViewContentTopMargin, 0, 0);
       _vscrollbar->SetContentOffset(0, 0);
     }
 
@@ -553,7 +555,7 @@
     // Set the size so that is is equal to the visible content.
     Area::SetBaseWidth(base.GetWidth());
     Area::SetBaseHeight(base.GetHeight());
-    Geometry geo = GetGeometry();
+    Geometry geo = GetNativeGeometry();
 
     // Horizontal scrollbar Geometry
     if (m_horizontal_scrollbar_enable)
@@ -568,8 +570,8 @@
       _hscrollbar->ComputeContentSize();
 
       //---
-      _hscrollbar->SetContainerSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
-                                    GetBaseY() + m_top_border + m_ViewContentTopMargin,
+      _hscrollbar->SetContainerSize(GetNativeX() + m_border + m_ViewContentLeftMargin,
+                                    GetNativeY() + m_top_border + m_ViewContentTopMargin,
                                     GetBaseWidth() - ScrollbarWidth - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin,
                                     GetBaseHeight() - ScrollbarHeight - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin);
 
@@ -580,8 +582,8 @@
       }
       else
       {
-        _hscrollbar->SetContentSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
-                                    GetBaseY() + m_top_border + m_ViewContentTopMargin, 0, 0);
+        _hscrollbar->SetContentSize(GetNativeX() + m_border + m_ViewContentLeftMargin,
+                                    GetNativeY() + m_top_border + m_ViewContentTopMargin, 0, 0);
       }
 
       _hscrollbar->SetContentOffset(_delta_x, _delta_y);
@@ -594,12 +596,12 @@
       _hscrollbar->ComputeContentSize();
 
       //---
-      _hscrollbar->SetContainerSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
-                                    GetBaseY() + m_top_border + m_ViewContentTopMargin,
+      _hscrollbar->SetContainerSize(GetNativeX() + m_border + m_ViewContentLeftMargin,
+                                    GetNativeY() + m_top_border + m_ViewContentTopMargin,
                                     GetBaseWidth() - ScrollbarWidth - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin,
                                     GetBaseHeight() - ScrollbarHeight - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin);
-      _hscrollbar->SetContentSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
-                                  GetBaseY() + m_top_border + m_ViewContentTopMargin, 0, 0);
+      _hscrollbar->SetContentSize(GetNativeX() + m_border + m_ViewContentLeftMargin,
+                                  GetNativeY() + m_top_border + m_ViewContentTopMargin, 0, 0);
       _hscrollbar->SetContentOffset(0, 0);
     }
 
@@ -617,8 +619,8 @@
       _vscrollbar->ComputeContentSize();
 
       //---
-      _vscrollbar->SetContainerSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
-                                    GetBaseY() + m_top_border + m_ViewContentTopMargin,
+      _vscrollbar->SetContainerSize(GetNativeX() + m_border + m_ViewContentLeftMargin,
+                                    GetNativeY() + m_top_border + m_ViewContentTopMargin,
                                     GetBaseWidth() - ScrollbarWidth - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin,
                                     GetBaseHeight() - ScrollbarHeight - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin);
 
@@ -629,8 +631,8 @@
       }
       else
       {
-        _vscrollbar->SetContentSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
-                                    GetBaseY() + m_top_border + m_ViewContentTopMargin, 0, 0);
+        _vscrollbar->SetContentSize(GetNativeX() + m_border + m_ViewContentLeftMargin,
+                                    GetNativeY() + m_top_border + m_ViewContentTopMargin, 0, 0);
       }
 
       _vscrollbar->SetContentOffset(_delta_x, _delta_y);
@@ -643,12 +645,12 @@
       _vscrollbar->ComputeContentSize();
 
       //---
-      _vscrollbar->SetContainerSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
-                                    GetBaseY() + m_top_border + m_ViewContentTopMargin,
+      _vscrollbar->SetContainerSize(GetNativeX() + m_border + m_ViewContentLeftMargin,
+                                    GetNativeY() + m_top_border + m_ViewContentTopMargin,
                                     GetBaseWidth() - ScrollbarWidth - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin,
                                     GetBaseHeight() - ScrollbarHeight - m_top_border - m_border - m_ViewContentBottomMargin - m_ViewContentTopMargin);
-      _vscrollbar->SetContentSize(GetBaseX() + m_border + m_ViewContentLeftMargin,
-                                  GetBaseY() + m_top_border + m_ViewContentTopMargin, 0, 0);
+      _vscrollbar->SetContentSize(GetNativeX() + m_border + m_ViewContentLeftMargin,
+                                  GetNativeY() + m_top_border + m_ViewContentTopMargin, 0, 0);
       _vscrollbar->SetContentOffset(0, 0);
     }
 
@@ -666,15 +668,15 @@
 // This function is called when the ScrollView is embedded within a Layout.
   void ScrollView::ComputeContentPosition(float /* offsetX */, float /* offsetY */)
   {
-    Geometry geo = GetGeometry();
+    Geometry geo = GetNativeGeometry();
     int w = 0;
     int h = 0;
 
     w = _vscrollbar->GetBaseWidth();
     h = _hscrollbar->GetBaseHeight();
 
-    m_ViewX = GetBaseX() + m_border + m_ViewContentLeftMargin;
-    m_ViewY = GetBaseY() + m_top_border + m_ViewContentTopMargin;
+    m_ViewX = GetNativeX() + m_border + m_ViewContentLeftMargin;
+    m_ViewY = GetNativeY() + m_top_border + m_ViewContentTopMargin;
 
     if (m_vertical_scrollbar_enable == false)
       m_ViewWidth = GetBaseWidth() - 2 * m_border - m_ViewContentRightMargin - m_ViewContentLeftMargin;
 
=== modified file 'Nux/SpinBox.cpp'
--- Nux/SpinBox.cpp	2012-10-10 22:46:50 +0000
+++ Nux/SpinBox.cpp	2012-12-17 15:42:23 +0000
@@ -82,27 +82,27 @@
 
   void SpinBox::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     GetPainter().PaintBackground(graphics_engine, base);
 
     if (m_EditLine->IsMouseInside() || m_SpinnerUpBtn->IsMouseInside() || m_SpinnerDownBtn->IsMouseInside())
     {
 
-      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerUpBtn->GetGeometry(), SPINBOX_BUTTON_MOUSEOVER_COLOR, eSHAPE_CORNER_ROUND4,
+      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerUpBtn->GetGeometryRelativeTo(this), SPINBOX_BUTTON_MOUSEOVER_COLOR, eSHAPE_CORNER_ROUND4,
                                  eCornerTopRight, false);
-      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerDownBtn->GetGeometry(), SPINBOX_BUTTON_MOUSEOVER_COLOR, eSHAPE_CORNER_ROUND4,
+      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerDownBtn->GetGeometryRelativeTo(this), SPINBOX_BUTTON_MOUSEOVER_COLOR, eSHAPE_CORNER_ROUND4,
                                  eCornerBottomRight, false);
     }
     else
     {
-      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerUpBtn->GetGeometry(), SPINBOX_BUTTON_COLOR, eSHAPE_CORNER_ROUND4,
+      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerUpBtn->GetGeometryRelativeTo(this), SPINBOX_BUTTON_COLOR, eSHAPE_CORNER_ROUND4,
                                  eCornerTopRight, false);
-      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerDownBtn->GetGeometry(), SPINBOX_BUTTON_COLOR, eSHAPE_CORNER_ROUND4,
+      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerDownBtn->GetGeometryRelativeTo(this), SPINBOX_BUTTON_COLOR, eSHAPE_CORNER_ROUND4,
                                  eCornerBottomRight, false);
     }
 
     GeometryPositioning gp(eHACenter, eVACenter);
-    Geometry GeoPo = ComputeGeometryPositioning(m_SpinnerUpBtn->GetGeometry(), GetTheme().GetImageGeometry(eSPINER_UP), gp);
+    Geometry GeoPo = ComputeGeometryPositioning(m_SpinnerUpBtn->GetGeometryRelativeTo(this), GetTheme().GetImageGeometry(eSPINER_UP), gp);
 
     if (m_SpinnerUpBtn->IsMouseInside())
       GetPainter().PaintShape(graphics_engine, GeoPo, Color(0xFFFFFFFF), eSPINER_UP);
@@ -111,7 +111,7 @@
 
 
     gp.SetAlignment(eHACenter, eVACenter);
-    GeoPo = ComputeGeometryPositioning(m_SpinnerDownBtn->GetGeometry(), GetTheme().GetImageGeometry(eSPINER_DOWN), gp);
+    GeoPo = ComputeGeometryPositioning(m_SpinnerDownBtn->GetGeometryRelativeTo(this), GetTheme().GetImageGeometry(eSPINER_DOWN), gp);
 
     if (m_SpinnerDownBtn->IsMouseInside())
       GetPainter().PaintShape(graphics_engine, GeoPo, Color(0xFFFFFFFF), eSPINER_DOWN);
 
=== modified file 'Nux/SpinBoxDouble.cpp'
--- Nux/SpinBoxDouble.cpp	2012-10-10 22:46:50 +0000
+++ Nux/SpinBoxDouble.cpp	2012-12-17 15:42:23 +0000
@@ -85,27 +85,27 @@
 
   void SpinBoxDouble::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     GetPainter().PaintBackground(graphics_engine, base);
 
     if (m_EditLine->IsMouseInside() || m_SpinnerUpBtn->IsMouseInside() || m_SpinnerDownBtn->IsMouseInside())
     {
 
-      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerUpBtn->GetGeometry(), SPINBOX_DOUBLE_BUTTON_MOUSEOVER_COLOR, eSHAPE_CORNER_ROUND4,
+      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerUpBtn->GetGeometryRelativeTo(this), SPINBOX_DOUBLE_BUTTON_MOUSEOVER_COLOR, eSHAPE_CORNER_ROUND4,
                                  eCornerTopRight, false);
-      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerDownBtn->GetGeometry(), SPINBOX_DOUBLE_BUTTON_MOUSEOVER_COLOR, eSHAPE_CORNER_ROUND4,
+      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerDownBtn->GetGeometryRelativeTo(this), SPINBOX_DOUBLE_BUTTON_MOUSEOVER_COLOR, eSHAPE_CORNER_ROUND4,
                                  eCornerBottomRight, false);
     }
     else
     {
-      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerUpBtn->GetGeometry(), SPINBOX_DOUBLE_BUTTON_COLOR, eSHAPE_CORNER_ROUND4,
+      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerUpBtn->GetGeometryRelativeTo(this), SPINBOX_DOUBLE_BUTTON_COLOR, eSHAPE_CORNER_ROUND4,
                                  eCornerTopRight, false);
-      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerDownBtn->GetGeometry(), SPINBOX_DOUBLE_BUTTON_COLOR, eSHAPE_CORNER_ROUND4,
+      GetPainter().PaintShapeCorner(graphics_engine, m_SpinnerDownBtn->GetGeometryRelativeTo(this), SPINBOX_DOUBLE_BUTTON_COLOR, eSHAPE_CORNER_ROUND4,
                                  eCornerBottomRight, false);
     }
 
     GeometryPositioning gp(eHACenter, eVACenter);
-    Geometry GeoPo = ComputeGeometryPositioning(m_SpinnerUpBtn->GetGeometry(), GetTheme().GetImageGeometry(eSPINER_UP), gp);
+    Geometry GeoPo = ComputeGeometryPositioning(m_SpinnerUpBtn->GetGeometryRelativeTo(this), GetTheme().GetImageGeometry(eSPINER_UP), gp);
 
     if (m_SpinnerUpBtn->IsMouseInside())
       GetPainter().PaintShape(graphics_engine, GeoPo, Color(0xFFFFFFFF), eSPINER_UP);
@@ -114,7 +114,7 @@
 
 
     gp.SetAlignment(eHACenter, eVACenter);
-    GeoPo = ComputeGeometryPositioning(m_SpinnerDownBtn->GetGeometry(), GetTheme().GetImageGeometry(eSPINER_DOWN), gp);
+    GeoPo = ComputeGeometryPositioning(m_SpinnerDownBtn->GetGeometryRelativeTo(this), GetTheme().GetImageGeometry(eSPINER_DOWN), gp);
 
     if (m_SpinnerDownBtn->IsMouseInside())
       GetPainter().PaintShape(graphics_engine, GeoPo, Color(0xFFFFFFFF), eSPINER_DOWN);
 
=== modified file 'Nux/StaticText.cpp'
--- Nux/StaticText.cpp	2012-11-04 10:45:15 +0000
+++ Nux/StaticText.cpp	2012-12-17 15:42:23 +0000
@@ -224,7 +224,7 @@
     if (!dw_texture_.IsValid())
       return;
 
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     graphics_engine.PushClippingRectangle(base);
 
     nux::GetPainter().PaintBackground(graphics_engine, base);
@@ -243,7 +243,7 @@
     int y = base.y + (base.height - dw_texture_->GetHeight()) / 2;
 
     int x = base.x;
-    
+
     //Special case: In the horizontal direction, if the width of the text is smaller than the 
     // width of the view, then center the text horizontally.
     if (dw_texture_->GetWidth() < base.width)
 
=== modified file 'Nux/StaticTextBox.cpp'
--- Nux/StaticTextBox.cpp	2012-10-10 22:46:50 +0000
+++ Nux/StaticTextBox.cpp	2012-12-17 15:42:23 +0000
@@ -60,20 +60,20 @@
 
   void StaticTextBox::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     {
       graphics_engine.PushClippingRectangle(base);
 
       if (m_bDrawBackground)
       {
         GetPainter().PushDrawLayer(graphics_engine, base, m_Background);
-        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetGeometry(), m_Text, m_TextColor, m_WriteAlpha, m_TextAlignment);
+        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetNativeGeometry(), m_Text, m_TextColor, m_WriteAlpha, m_TextAlignment);
         GetPainter().PopBackground();
       }
       else
       {
         //GetPainter().PaintBackground(graphics_engine, base);
-        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetGeometry(), m_Text, m_TextColor, m_WriteAlpha, m_TextAlignment);
+        GetPainter().PaintTextLineStatic(graphics_engine, GetFont(), GetNativeGeometry(), m_Text, m_TextColor, m_WriteAlpha, m_TextAlignment);
       }
 
       graphics_engine.PopClippingRectangle();
 
=== modified file 'Nux/TabView.cpp'
--- Nux/TabView.cpp	2012-11-05 21:31:06 +0000
+++ Nux/TabView.cpp	2012-12-17 15:42:23 +0000
@@ -135,7 +135,7 @@
     RemoveCompositionLayout();
     delete(tabright_callback);
     delete(tableft_callback);
-    
+
     std::vector<TabElement *>::iterator it;
 
     for (it = _tab_array.begin(); it != _tab_array.end(); it++)
@@ -184,28 +184,30 @@
       m_DrawBackgroundOnPreviousGeometry = false;
     }
 
-    graphics_engine.PushClippingRectangle(GetGeometry());
-    Geometry base = GetGeometry();
-
-    GetPainter().PushDrawShapeLayer(graphics_engine, Geometry(base.x, base.y, base.GetWidth(), TAB_HEIGHT), eSHAPE_CORNER_ROUND4, TAB_HEADER_BACKGROUND_COLOR, eCornerTopLeft | eCornerTopRight);
+    Geometry base = GetNativeGeometry();
+    graphics_engine.PushClippingRectangle(base);
+
+    base = GetGeometryRelativeTo(this);
+
+    GetPainter().PushDrawShapeLayer(graphics_engine, Geometry(base.x, base.y, base.width, TAB_HEIGHT), eSHAPE_CORNER_ROUND4, TAB_HEADER_BACKGROUND_COLOR, eCornerTopLeft | eCornerTopRight);
 
     if (_visible_tab_content_layout)
       _visible_tab_content_layout->QueueDraw();
 
     unsigned int vector_size = (unsigned int) _tab_array.size();
 
-    Geometry geo = GetGeometry();
+    Geometry geo = GetNativeGeometry();
     Geometry clip_geo;
     clip_geo.SetX(geo.x);
     clip_geo.SetY(geo.y);
-    clip_geo.SetWidth(geo.GetWidth() - 2 * TAB_BUTTON_WIDTH);
+    clip_geo.SetWidth(geo.width - 2 * TAB_BUTTON_WIDTH);
     clip_geo.SetHeight(_tabview_heads_layout->GetBaseHeight());
 
     graphics_engine.PushClippingRectangle(clip_geo);
 
     for (unsigned int i = 0; i < vector_size; i++)
     {
-      Geometry tab_geo = _tab_array[i]->_tab_area->GetGeometry();
+      Geometry tab_geo = _tab_array[i]->_tab_area->GetAbsoluteGeometry();
       const char *tab_text = _tab_array[i]->GetName().c_str();
 
       if (_tab_array[i]->_index == m_FocusTabIndex)
@@ -224,21 +226,22 @@
 
     graphics_engine.PopClippingRectangle();
 
-    GetPainter().PaintShapeCorner(graphics_engine, Geometry(base.x, base.y + TAB_HEIGHT, base.GetWidth(), base.GetHeight() - TAB_HEIGHT),
+    Geometry rgeo = GetGeometryRelativeTo(this);
+    GetPainter().PaintShapeCorner(graphics_engine, Geometry(rgeo.x, rgeo.y + TAB_HEIGHT, rgeo.width, rgeo.height - TAB_HEIGHT),
                                TAB_BACKGROUND_COLOR, eSHAPE_CORNER_ROUND4, eCornerBottomLeft | eCornerBottomRight, false);
 
-    GetPainter().Paint2DQuadColor(graphics_engine, _scroll_right->GetGeometry(), TAB_HEADER_BACKGROUND_COLOR);
+    GetPainter().Paint2DQuadColor(graphics_engine, _scroll_right->GetAbsoluteGeometry(), TAB_HEADER_BACKGROUND_COLOR);
     GeometryPositioning gp(eHACenter, eVACenter);
-    Geometry GeoPo = ComputeGeometryPositioning(_scroll_right->GetGeometry(), GetTheme().GetImageGeometry(eTAB_RIGHT), gp);
+    Geometry GeoPo = ComputeGeometryPositioning(_scroll_right->GetGeometryRelativeTo(this), GetTheme().GetImageGeometry(eTAB_RIGHT), gp);
 
     if (_scroll_right->IsMouseInside())
       GetPainter().PaintShape(graphics_engine, GeoPo, Color(0xFFFFFFFF), eTAB_RIGHT);
     else
       GetPainter().PaintShape(graphics_engine, GeoPo, TAB_HEADER_FOCUS_COLOR, eTAB_RIGHT);
 
-    GetPainter().Paint2DQuadColor(graphics_engine, _scroll_left->GetGeometry(), TAB_HEADER_BACKGROUND_COLOR);
+    GetPainter().Paint2DQuadColor(graphics_engine, _scroll_left->GetAbsoluteGeometry(), TAB_HEADER_BACKGROUND_COLOR);
     gp.SetAlignment(eHACenter, eVACenter);
-    GeoPo = ComputeGeometryPositioning(_scroll_left->GetGeometry(), GetTheme().GetImageGeometry(eTAB_LEFT), gp);
+    GeoPo = ComputeGeometryPositioning(_scroll_left->GetGeometryRelativeTo(this), GetTheme().GetImageGeometry(eTAB_LEFT), gp);
 
     if (_scroll_left->IsMouseInside())
       GetPainter().PaintShape(graphics_engine, GeoPo, Color(0xFFFFFFFF), eTAB_LEFT);
@@ -251,15 +254,15 @@
 
   void TabView::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetGeometryRelativeTo(this);
 
-    graphics_engine.PushClippingRectangle(GetGeometry());
+    graphics_engine.PushClippingRectangle(base);
     GetPainter().PushShapeLayer(graphics_engine, Geometry(base.x, base.y + TAB_HEIGHT, base.GetWidth(), base.GetHeight() - TAB_HEIGHT),
                              eSHAPE_CORNER_ROUND4, TAB_BACKGROUND_COLOR, eCornerBottomLeft | eCornerBottomRight);
 
     if (_visible_tab_content_layout)
     {
-      graphics_engine.PushClippingRectangle(_visible_tab_content_layout->GetGeometry());
+      graphics_engine.PushClippingRectangle(_visible_tab_content_layout->GetGeometryRelativeTo(this));
       _visible_tab_content_layout->ProcessDraw(graphics_engine, force_draw);
       graphics_engine.PopClippingRectangle();
     }
@@ -273,7 +276,7 @@
     // Give the managed layout appropriate size and position..
     if (view_layout_)
     {
-      Geometry layout_geo = GetGeometry();
+      Geometry layout_geo = GetGeometryRelativeTo(this);
       layout_geo.OffsetPosition(TAB_X_BORDER, TAB_HEIGHT);
       layout_geo.OffsetSize(-2 * TAB_X_BORDER, - (TAB_HEIGHT) - TAB_Y_BORDER);
       view_layout_->SetGeometry(layout_geo);
@@ -287,15 +290,15 @@
     // been changed by ComputeContentSize.
     if (view_layout_)
     {
-      Geometry base = view_layout_->GetGeometry();
+      Geometry base = view_layout_->GetGeometryRelativeTo(this);
       base.OffsetPosition(-TAB_X_BORDER, -TAB_HEIGHT);
       base.OffsetSize(2 * TAB_X_BORDER, TAB_HEIGHT + TAB_Y_BORDER);
       Area::SetGeometry(base);
     }
 
-    Geometry base = GetGeometry();
+    Geometry base = GetGeometryRelativeTo(this);
 
-    int tab_x = view_layout_->GetGeometry().x + view_layout_->GetGeometry().GetWidth() - 2 * TAB_BUTTON_WIDTH;
+    int tab_x = base.x + base.width - 2 * TAB_BUTTON_WIDTH;
     int tab_y = base.y;
 
     _scroll_left->SetBaseXY(tab_x, tab_y);
@@ -325,8 +328,8 @@
   {
     if (view_layout_)
     {
-      view_layout_->SetBaseX(GetBaseX() + TAB_X_BORDER);
-      view_layout_->SetBaseY(GetBaseY() + TAB_HEIGHT);
+      view_layout_->SetBaseX(GetNativeX() + TAB_X_BORDER);
+      view_layout_->SetBaseY(GetNativeY() + TAB_HEIGHT);
       view_layout_->ComputeContentPosition(offsetX, offsetY);
     }
   }
@@ -402,30 +405,32 @@
 //        return;
 
     m_TabPositionOffset += offset;
-    int lx = view_layout_->GetBaseX() + m_TabPositionOffset;
-
-    if (lx > view_layout_->GetBaseX())
+    Geometry lgeo = view_layout_->GetGeometry();
+
+    int lx = lgeo.x + m_TabPositionOffset;
+
+    if (lx > lgeo.x)
     {
       // end of scroll left;
       m_TabPositionOffset = 0;
-      lx = view_layout_->GetBaseX() + m_TabPositionOffset;
+      //lx = view_layout_->GetBaseX() + m_TabPositionOffset;
+      lx = lgeo.x + m_TabPositionOffset;
     }
 
-    if (lx + _tabview_heads_layout->GetBaseWidth() < view_layout_->GetBaseX() +
+    if (lx + _tabview_heads_layout->GetBaseWidth() < lgeo.x +
         view_layout_->GetBaseWidth() - 2 * TAB_BUTTON_WIDTH)
     {
 
-      lx = (view_layout_->GetBaseX() +
+      lx = (lgeo.x +
             view_layout_->GetBaseWidth() - 2 * TAB_BUTTON_WIDTH) - _tabview_heads_layout->GetBaseWidth();
 
-
-      if (lx > view_layout_->GetBaseX())
+      if (lx > lgeo.x)
       {
         m_TabPositionOffset = 0;
-        lx = view_layout_->GetBaseX() + m_TabPositionOffset;
+        lx = lgeo.x + m_TabPositionOffset;
       }
       else
-        m_TabPositionOffset = - (view_layout_->GetBaseX() - lx);
+        m_TabPositionOffset = - (lgeo.x - lx);
     }
 
     _tabview_heads_layout->SetBaseX(lx);
 
=== modified file 'Nux/TextureArea.cpp'
--- Nux/TextureArea.cpp	2012-11-17 23:22:51 +0000
+++ Nux/TextureArea.cpp	2012-12-17 15:42:23 +0000
@@ -50,17 +50,17 @@
   void TextureArea::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
     // Ability to rotate the widget around its center
-    graphics_engine.PushModelViewMatrix(Matrix4::TRANSLATE(-GetBaseX() - GetBaseWidth() / 2, -GetBaseY() - GetBaseHeight() / 2, 0));
+    graphics_engine.PushModelViewMatrix(Matrix4::TRANSLATE(- GetBaseWidth() / 2, - GetBaseHeight() / 2, 0));
     graphics_engine.PushModelViewMatrix(Get2DRotation());
-    graphics_engine.PushModelViewMatrix(Matrix4::TRANSLATE(GetBaseX() + GetBaseWidth() / 2, GetBaseY() + GetBaseHeight() / 2, 0));
+    graphics_engine.PushModelViewMatrix(Matrix4::TRANSLATE(GetBaseWidth() / 2, GetBaseHeight() / 2, 0));
 
     // The TextureArea should not render the accumulated background. That is left to the caller.
     // GetPainter().PaintBackground(graphics_engine, GetGeometry());
 
     if (paint_layer_)
     {
-      paint_layer_->SetGeometry(GetGeometry());
-      GetPainter().RenderSinglePaintLayer(graphics_engine, GetGeometry(), paint_layer_);
+      paint_layer_->SetGeometry(GetNativeGeometry());
+      GetPainter().RenderSinglePaintLayer(graphics_engine, GetNativeGeometry(), paint_layer_);
     }
 
     graphics_engine.PopModelViewMatrix();
 
=== modified file 'Nux/VLayout.cpp'
--- Nux/VLayout.cpp	2012-12-08 01:03:38 +0000
+++ Nux/VLayout.cpp	2012-12-17 15:42:23 +0000
@@ -245,8 +245,8 @@
       VLayoutManagement(width, height);
 
       // Objects have been resized, now position them.
-      int current_x = GetBaseX() + left_padding_;
-      int current_y = GetBaseY() + top_padding_;
+      int current_x = left_padding_;
+      int current_y = top_padding_;
 
       //int per_element_space = 0;
       //int total_used_space = 0;
@@ -364,12 +364,12 @@
           continue;
 
         int ret = 0;
-        
+
         if (((*it)->IsLayout() || (*it)->IsView()) /*&& ((*it)->IsLayoutDone() == false)*/ /*&& ((*it)->GetScaleFactor() != 0)*/)
         {
-          Geometry pre_geo = (*it)->GetGeometry();
+          Geometry pre_geo = (*it)->GetNativeGeometry();
           ret = (*it)->ComputeContentSize();
-          Geometry post_geo = (*it)->GetGeometry();
+          Geometry post_geo = (*it)->GetNativeGeometry();
 
           bool larger_width    = pre_geo.width < post_geo.width;
           bool smaller_width   = pre_geo.width > post_geo.width;
@@ -563,7 +563,7 @@
       {
         if (!(*it)->IsVisible())
           continue;
-        
+
         if ((*it)->GetScaleFactor() == 0 || (*it)->IsLayoutDone() == true)
         {
           available_height -= (*it)->GetBaseHeight();
@@ -610,7 +610,7 @@
       {
         if (!(*it)->IsVisible())
           continue;
-       
+
         if (((*it)->GetScaleFactor() != 0) && ((*it)->IsLayoutDone() == false))
         {
           float sf = (float) (*it)->GetScaleFactor();
@@ -772,8 +772,8 @@
       height -= (int) (num_element - 1) * space_between_children_ + (top_padding_ + bottom_padding_);
 
       // Objects have been resized, now position them.
-      int current_x = GetBaseX() + left_padding_ + offsetX; // add base offset in X(used for scrolling)
-      int current_y = GetBaseY() + top_padding_ + offsetY; // add base offset in Y(used for scrolling)
+      int current_x = left_padding_ + offsetX; // add base offset in X(used for scrolling)
+      int current_y = top_padding_ + offsetY; // add base offset in Y(used for scrolling)
 
       int offset_space = 0;
       int element_margin = 0;
 
=== modified file 'Nux/VScrollBar.cpp'
--- Nux/VScrollBar.cpp	2012-11-05 21:31:06 +0000
+++ Nux/VScrollBar.cpp	2012-12-17 15:42:23 +0000
@@ -283,7 +283,7 @@
 
   void VScrollBar::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
     GetPainter().PaintBackground(graphics_engine, base);
 
     base.OffsetPosition(0, VSCROLLBAR_HEIGHT);
@@ -300,7 +300,7 @@
 
     if (content_height_ > container_height_)
     {
-      Geometry slider_geo = _slider->GetGeometry();
+      Geometry slider_geo = _slider->GetGeometryRelativeTo(this);
       graphics_engine.QRP_Color(slider_geo.x, slider_geo.y, slider_geo.width, slider_geo.height,
           Color(1.0f, 1.0f, 1.0f, 0.8f));
     }
 
=== modified file 'Nux/VSplitter.cpp'
--- Nux/VSplitter.cpp	2012-11-17 17:18:11 +0000
+++ Nux/VSplitter.cpp	2012-12-17 15:42:23 +0000
@@ -78,16 +78,18 @@
 
   void VSplitter::Draw(GraphicsEngine &graphics_engine, bool /* force_draw */)
   {
-    Geometry base = GetGeometry();
+    // Save the model view matrix. We reuse it when drawing the splitter overlay during a resize operation.
+    local_model_view_matrix_ = graphics_engine.GetModelViewMatrix();
+
+    Geometry base = GetNativeGeometry();
     graphics_engine.PushClippingRectangle(base);
     std::vector<Area *>::iterator it;
 
-    GetPainter().PaintBackground(graphics_engine, base);
     std::vector<MySplitter *>::iterator it_splitter;
 
     for (it_splitter = m_SplitterObject.begin(); it_splitter != m_SplitterObject.end(); ++it_splitter)
     {
-      Geometry geo = (*it_splitter)->GetGeometry();
+      Geometry geo = (*it_splitter)->GetGeometryRelativeTo(this);
       Geometry grip_geo;
       int h = 20;
 
@@ -115,8 +117,9 @@
 
   void VSplitter::DrawContent(GraphicsEngine &graphics_engine, bool force_draw)
   {
-    graphics_engine.PushClippingRectangle(GetGeometry());
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
+    graphics_engine.PushClippingRectangle(base);
+
     bool need_redraw = IsRedrawNeeded();
 
     std::vector<MySplitter *>::iterator it_splitter;
@@ -126,7 +129,7 @@
          it != m_InterfaceObject.end();
          ++it, ++it_splitter)
     {
-      Geometry sgeo = (*it_splitter)->GetGeometry();
+      Geometry sgeo = (*it_splitter)->GetGeometryRelativeTo(this);
       graphics_engine.PushClippingRectangle(Rect(
                                           base.x, base.y, sgeo.x - base.x, base.GetHeight()));
 
@@ -178,13 +181,20 @@
   void VSplitter::OverlayDrawing(GraphicsEngine &graphics_engine)
   {
     unsigned int num_element = (unsigned int) m_SplitterObject.size();
-
-    Geometry base = GetGeometry();
+    Geometry base = GetNativeGeometry();
+
+    // Transform this area position with the model view matrix we captured earlier.
+    Vector4 v = local_model_view_matrix_ * Vector4(base.x, base.y, 0.0f, 1.0f);
+
+    // base is now in window coordinates
+    base.x = v.x;
+    base.y = v.y;
 
     if (m_focus_splitter_index >= 0)
     {
-      Geometry geo = m_SplitterObject[m_focus_splitter_index]->GetGeometry();
-      geo.OffsetPosition(mvt_dx, mvt_dy);
+      Geometry geo = m_SplitterObject[m_focus_splitter_index]->GetGeometryRelativeTo(this);
+
+      geo.OffsetPosition(base.x + mvt_dx, base.y + mvt_dy);
 
       if (m_focus_splitter_index == 0 && num_element > 1)
       {
@@ -193,22 +203,22 @@
           geo.SetX(base.x);
         }
 
-        if (geo.x  + VSPLITTERWIDTH > m_SplitterObject[m_focus_splitter_index + 1]->GetGeometry().x)
+        if (geo.x  + VSPLITTERWIDTH > base.x + m_SplitterObject[m_focus_splitter_index + 1]->GetGeometryRelativeTo(this).x)
         {
-          geo.SetX(m_SplitterObject[m_focus_splitter_index+1]->GetGeometry().x - VSPLITTERWIDTH);
+          geo.SetX(base.x + m_SplitterObject[m_focus_splitter_index+1]->GetGeometryRelativeTo(this).x - VSPLITTERWIDTH);
         }
       }
 
       if ((m_focus_splitter_index > 0) && m_focus_splitter_index < (int) num_element - 1)
       {
-        if (geo.x < m_SplitterObject[m_focus_splitter_index - 1]->GetGeometry().x + VSPLITTERWIDTH)
+        if (geo.x < m_SplitterObject[m_focus_splitter_index - 1]->GetGeometryRelativeTo(this).x + VSPLITTERWIDTH)
         {
-          geo.SetX(m_SplitterObject[m_focus_splitter_index - 1]->GetGeometry().x + VSPLITTERWIDTH);
+          geo.SetX(m_SplitterObject[m_focus_splitter_index - 1]->GetGeometryRelativeTo(this).x + VSPLITTERWIDTH);
         }
 
-        if (geo.x + VSPLITTERWIDTH > m_SplitterObject[m_focus_splitter_index + 1]->GetGeometry().x)
+        if (geo.x + VSPLITTERWIDTH > m_SplitterObject[m_focus_splitter_index + 1]->GetGeometryRelativeTo(this).x)
         {
-          geo.SetX(m_SplitterObject[m_focus_splitter_index + 1]->GetGeometry().x - VSPLITTERWIDTH);
+          geo.SetX(m_SplitterObject[m_focus_splitter_index + 1]->GetGeometryRelativeTo(this).x - VSPLITTERWIDTH);
         }
       }
 
@@ -251,8 +261,8 @@
   long VSplitter::ComputeContentSize()
   {
     unsigned int num_element = (unsigned int) m_InterfaceObject.size();
-    int x = GetBaseX();
-    int y = GetBaseY();
+    int x = 0;
+    int y = 0;
     int w = GetBaseWidth();
     int h = GetBaseHeight();
 
@@ -285,7 +295,7 @@
     {
       for (unsigned int i = 0; i < num_element; i++)
       {
-        Geometry splitter_geo = m_SplitterObject[i]->GetGeometry();
+        Geometry splitter_geo = m_SplitterObject[i]->GetGeometryRelativeTo(this);
         splitter_geo.SetHeight(h);
         splitter_geo.SetY(y);
 
@@ -301,7 +311,7 @@
 
       for (unsigned int i = 0; i < num_element; i++)
       {
-        Geometry splitter_geo = m_SplitterObject[i]->GetGeometry();
+        Geometry splitter_geo = m_SplitterObject[i]->GetGeometryRelativeTo(this);
         // compute percentage of space occupied by the element i;
         // width of element i = m_SplitterObject[i]->GetX() - previous_splliter_end
         int splitter_start = m_SplitterObject[i]->GetBaseX();
@@ -328,7 +338,7 @@
 
     for (unsigned int i = 0; i < num_element; i++)
     {
-      Geometry splitter_geo = m_SplitterObject[i]->GetGeometry();
+      Geometry splitter_geo = m_SplitterObject[i]->GetGeometryRelativeTo(this);
 
       //m_InterfaceObject[i]->SetGeometry(Geometry(accwidth, y, splitter_geo.x - accwidth, h));
 
@@ -362,8 +372,8 @@
 
   void VSplitter::ResetSplitConfig()
   {
-    int x = GetBaseX();
-    int y = GetBaseY();
+    int x = 0;
+    int y = 0;
     int w = GetBaseWidth();
     int h = GetBaseHeight();
     unsigned int num_element = (unsigned int) m_InterfaceObject.size();
@@ -403,6 +413,7 @@
       x += stretchfactor * max_size / max_stretch;
       Geometry geo(x, y, VSPLITTERWIDTH, h);
       m_SplitterObject[i]->SetGeometry(geo);
+      x += VSPLITTERWIDTH;
     }
 
     m_SplitterObject[num_element-1]->SetBaseX(x + w - VSPLITTERWIDTH);
@@ -425,7 +436,7 @@
   {
     if (mvt_dx)
     {
-      Geometry geo = m_SplitterObject[header_pos]->GetGeometry();
+      Geometry geo = m_SplitterObject[header_pos]->GetGeometryRelativeTo(this);
       geo.OffsetPosition(mvt_dx, 0);
 
       unsigned int num_element = (unsigned int) m_SplitterObject.size();
@@ -433,8 +444,8 @@
       if (header_pos < (int) num_element - 1)
       {
         // Make the splitter bar stick to the next one if the distance between them is less than VSTICK_SIZE
-        if (m_SplitterObject[header_pos + 1]->GetGeometry().x - geo.x - VSPLITTERWIDTH < VSTICK_SIZE)
-          geo.SetX( m_SplitterObject[header_pos + 1]->GetGeometry().x - VSPLITTERWIDTH );
+        if (m_SplitterObject[header_pos + 1]->GetGeometryRelativeTo(this).x - geo.x - VSPLITTERWIDTH < VSTICK_SIZE)
+          geo.SetX( m_SplitterObject[header_pos + 1]->GetGeometryRelativeTo(this).x - VSPLITTERWIDTH );
       }
 
       m_SplitterObject[header_pos]->SetGeometry(geo);
@@ -453,7 +464,7 @@
 
   void VSplitter::OnSplitterMouseDrag(int x, int /* y */, int /* dx */, int /* dy */, unsigned long /* button_flags */, unsigned long /* key_flags */, int header_pos)
   {
-    Geometry geo = m_SplitterObject[header_pos]->GetGeometry();
+    Geometry geo = m_SplitterObject[header_pos]->GetGeometryRelativeTo(this);
     int num_element = (int) m_SplitterObject.size();
 
     if (header_pos == num_element - 1)
@@ -483,17 +494,17 @@
 
   void VSplitter::ResizeSplitter(int header_pos)
   {
-    Geometry geo = m_SplitterObject[header_pos]->GetGeometry();
+    Geometry geo = m_SplitterObject[header_pos]->GetGeometryRelativeTo(this);
     int num_element = (int) m_SplitterObject.size();
 
-    if ((header_pos == 0) && (m_SplitterObject[header_pos]->GetBaseX() < GetBaseX()))
+    if ((header_pos == 0) && (m_SplitterObject[header_pos]->GetBaseX() < 0))
     {
-      m_SplitterObject[header_pos]->SetBaseX(GetBaseX());
+      m_SplitterObject[header_pos]->SetBaseX(0);
     }
 
     if ((header_pos == num_element - 1) && (m_SplitterObject[header_pos]->GetBaseX() > GetBaseX() + GetBaseWidth() - VSPLITTERWIDTH))
     {
-      m_SplitterObject[header_pos]->SetBaseX(GetBaseX() + GetBaseWidth() - VSPLITTERWIDTH);
+      m_SplitterObject[header_pos]->SetBaseX(GetBaseWidth() - VSPLITTERWIDTH);
     }
 
     if (header_pos < (int) num_element - 1)
 
=== modified file 'Nux/VSplitter.h'
--- Nux/VSplitter.h	2012-11-05 21:31:06 +0000
+++ Nux/VSplitter.h	2012-12-17 15:42:23 +0000
@@ -79,6 +79,7 @@
 
   private:
 
+    Matrix4 local_model_view_matrix_;
     typedef BasicView MySplitter;
     std::vector<Area *> m_InterfaceObject;
     std::vector<MySplitter *> m_SplitterObject;
 
=== modified file 'Nux/View.cpp'
--- Nux/View.cpp	2012-11-05 21:31:06 +0000
+++ Nux/View.cpp	2012-12-17 15:42:23 +0000
@@ -44,7 +44,7 @@
     backup_texture_.Release();
     backup_depth_texture_.Release();
     background_texture_.Release();
-    
+
     // It is possible that the window thread has been deleted before the view
     // itself, so check prior to calling.
     WindowThread* wt = GetWindowThread();
@@ -121,8 +121,8 @@
   {
     if (view_layout_)
     {
-      view_layout_->SetBaseX(GetBaseX());
-      view_layout_->SetBaseY(GetBaseY());
+      view_layout_->SetBaseX(0);
+      view_layout_->SetBaseY(0);
       view_layout_->ComputeContentPosition(offsetX, offsetY);
     }
   }
@@ -131,7 +131,7 @@
   {
     // Give the managed layout the same size and position as the Control.
     if (view_layout_)
-      view_layout_->SetGeometry(GetGeometry());
+      view_layout_->SetGeometry(GetNativeGeometry());
   }
 
   long View::PostLayoutManagement(long LayoutResult)
@@ -143,7 +143,10 @@
     {
       // If The layout is empty, do not change the size of the parent element.
       if (!view_layout_->IsEmpty())
-        Area::SetGeometry(view_layout_->GetGeometry());
+      {
+        Area::SetWidth(view_layout_->GetWidth());
+        Area::SetHeight(view_layout_->GetHeight());
+      }
     }
 
     return LayoutResult;
@@ -160,18 +163,28 @@
 
   void View::ProcessDraw(GraphicsEngine& graphics_engine, bool force_draw)
   {
+    if (this->Type().IsDerivedFromType(BasicView::StaticObjectType))
+    {
+      // Areas of type BasicView aren't drawing anything.
+      // Just skip them.
+      return;
+    }
+
     full_view_draw_cmd_ = false;
 
-    if (RedirectRenderingToTexture())
+    if (GetRedirectRenderingToTexture())
     {
       if (update_backup_texture_ || force_draw || draw_cmd_queued_)
       {
-        GetPainter().PushPaintLayerStack();        
+        GetPainter().PushPaintLayerStack();
         BeginBackupTextureRendering(graphics_engine, force_draw);
         {
           graphics_engine.PushModelViewMatrix(Get2DMatrix());
+          Matrix4 mat;
+          mat.Translate(GetX(), GetY(), 0);
+          graphics_engine.PushModelViewMatrix(mat);
 
-          Geometry translated_geo = GetGeometry();
+          Geometry translated_geo = GetNativeGeometry();
           translated_geo.x = 0;
           translated_geo.y = 0;
           if (force_draw)
@@ -195,46 +208,37 @@
             }
           }
           graphics_engine.PopModelViewMatrix();
+          graphics_engine.PopModelViewMatrix();
         }
         EndBackupTextureRendering(graphics_engine, force_draw);
         GetPainter().PopPaintLayerStack();
-      }
-
-      if (PresentRedirectedView())
-      {
-        unsigned int current_alpha_blend;
-        unsigned int current_src_blend_factor;
-        unsigned int current_dest_blend_factor;
-        // Be a good citizen, get a copy of the current GPU sates according to Nux
-        graphics_engine.GetRenderStates().GetBlend(current_alpha_blend, current_src_blend_factor, current_dest_blend_factor);
-
-        TexCoordXForm texxform;
-
-        if ((force_draw || draw_cmd_queued_) && (background_texture_.IsValid()))
+
+        if (GetPresentRedirectedView())
         {
-          graphics_engine.GetRenderStates().SetBlend(false);
-          texxform.FlipVCoord(true);
-          // Draw the background of this view.
-          GetGraphicsDisplay()->GetGraphicsEngine()->QRP_1Tex(GetX(), GetY(), background_texture_->GetWidth(), background_texture_->GetHeight(), background_texture_, texxform, color::White);
+          RedirectedArea ra;
+          ra.backup_texture = backup_texture_;
+          ra.geometry = GetAbsoluteGeometry();
+          ra.clipping_region = graphics_engine.GetClippingRegion();
+          ra.area = this;
+
+          GetWindowCompositor().QueueRedirected(ra);
         }
-
-        texxform.uwrap = TEXWRAP_CLAMP;
-        texxform.vwrap = TEXWRAP_CLAMP;
-        texxform.FlipVCoord(true);
-
-        graphics_engine.GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-        GetGraphicsDisplay()->GetGraphicsEngine()->QRP_1Tex(GetX(), GetY(), GetWidth(), GetHeight(), backup_texture_, texxform, Color(color::White));
-        // Be a good citizen, restore the Nux blending states.
-        graphics_engine.GetRenderStates().SetBlend(current_alpha_blend, current_src_blend_factor, current_dest_blend_factor);
+      }
+      else
+      {
+        GatherRedirectedViewForRendering(graphics_engine);
       }
     }
     else
     {
       graphics_engine.PushModelViewMatrix(Get2DMatrix());
+      Matrix4 mat;
+      mat.Translate(GetX(), GetY(), 0);
+      graphics_engine.PushModelViewMatrix(mat);
 
       if (force_draw)
       {
-        GetPainter().PaintBackground(graphics_engine, GetGeometry());
+        GetPainter().PaintBackground(graphics_engine, GetNativeGeometry());
         GetPainter().PushPaintLayerStack();
 
         draw_cmd_queued_ = true;
@@ -248,7 +252,7 @@
       {
         if (draw_cmd_queued_)
         {
-          GetPainter().PaintBackground(graphics_engine, GetGeometry());
+          GetPainter().PaintBackground(graphics_engine, GetNativeGeometry());
           GetPainter().PushPaintLayerStack();
 
           full_view_draw_cmd_ = true;
@@ -262,7 +266,7 @@
           DrawContent(graphics_engine, false);
         }
       }
-
+      graphics_engine.PopModelViewMatrix();
       graphics_engine.PopModelViewMatrix();
     }
 
@@ -288,13 +292,13 @@
 
     Geometry xform_geo;
     // Compute position in the active fbo texture.
-    xform_geo = graphics_engine.ModelViewXFormRect(GetGeometry());
+    xform_geo = graphics_engine.ModelViewXFormRect(GetNativeGeometry());
 
     // Get the active fbo...
     prev_fbo_ = GetGraphicsDisplay()->GetGpuDevice()->GetCurrentFrameBufferObject();
     // ... and the size of the view port rectangle.
     prev_viewport_ = graphics_engine.GetViewportRect();
-    
+
     const int width = GetWidth();
     const int height = GetHeight();
 
@@ -388,7 +392,7 @@
     graphics_engine.SetOrthographicProjectionMatrix(width, height);
     // Transform the geometry of this area through the current model view matrix. This gives the
     // the position of the view in the active fbo texture.
-    Geometry offset_rect = graphics_engine.ModelViewXFormRect(GetGeometry());
+    Geometry offset_rect = graphics_engine.ModelViewXFormRect(GetNativeGeometry());
     int x_offset = -offset_rect.x;
     int y_offset = -offset_rect.y;
     graphics_engine.PushModelViewMatrix(Matrix4::TRANSLATE(x_offset, y_offset, 0));
@@ -727,6 +731,33 @@
     return true;
   }
 
+  void View::GatherRedirectedViewForRendering(GraphicsEngine& graphics_engine)
+  {
+    if (IsVisible() && GetRedirectRenderingToTexture() && GetPresentRedirectedView())
+    {
+      if (backup_texture_.IsNull())
+      {
+        // Should not happen
+        return;
+      }
+
+      // Go through the children of this layout and add redirected view for post-rendering composition.
+      if (view_layout_)
+      {
+        view_layout_->GatherRedirectedViewForRendering(graphics_engine);
+      }
+
+      RedirectedArea ra;
+      ra.backup_texture = backup_texture_;
+      ra.geometry = GetAbsoluteGeometry();
+      ra.clipping_region = graphics_engine.GetClippingRegion();
+      ra.area = this;
+
+      // Queue this area for post-rendering composition.
+      GetWindowCompositor().QueueRedirected(ra);
+    }
+  }
+
 #ifdef NUX_GESTURES_SUPPORT
   Area* View::GetInputAreaHitByGesture(const nux::GestureEvent &event)
   {
 
=== modified file 'Nux/View.h'
--- Nux/View.h	2012-11-05 21:31:06 +0000
+++ Nux/View.h	2012-12-17 15:42:23 +0000
@@ -164,9 +164,10 @@
     virtual void ChildViewQueuedDraw(Area* area);
 
     void BeginBackupTextureRendering(GraphicsEngine& graphics_engine, bool force_draw);
-
     void EndBackupTextureRendering(GraphicsEngine& graphics_engine, bool force_draw);
 
+    virtual void GatherRedirectedViewForRendering(GraphicsEngine& graphics_engine);
+
     void OnChildFocusChanged(/*Area *parent,*/ Area *child);
     sigc::connection _on_focus_changed_handler;
 
 
=== modified file 'Nux/WindowCompositor.cpp'
--- Nux/WindowCompositor.cpp	2012-12-08 01:03:38 +0000
+++ Nux/WindowCompositor.cpp	2012-12-17 15:42:23 +0000
@@ -33,6 +33,7 @@
 #endif
 #include "PaintLayer.h"
 #include "Painter.h"
+#include "SceneComposer.h"
 #include "Layout.h"
 
 #include "NuxGraphics/FontTexture.h"
@@ -43,6 +44,7 @@
   WindowCompositor::WindowCompositor(WindowThread* window_thread)
   : reference_fbo_(0)
   , window_thread_(window_thread)
+  , scene_composer_(NULL)
   {
     m_OverlayWindow             = NULL;
     _tooltip_window             = NULL;
@@ -85,6 +87,9 @@
 
     m_MenuRemoved = false;
     m_Background = new ColorLayer(Color(0xFF4D4D4D));
+    scene_composer_ = new SceneComposer();
+
+    scene_composer_->SetGraphicsObjects(GetGraphicsDisplay()->GetGraphicsEngine(), GetGraphicsDisplay()->GetGpuDevice());
 
 #ifdef NUX_GESTURES_SUPPORT
     gesture_broker_.reset(new DefaultGestureBroker(this));
@@ -105,11 +110,14 @@
     _view_window_list.clear();
     _modal_view_window_list.clear();
 
+    delete scene_composer_;
+
 #if !defined(NUX_MINIMAL)
     _menu_chain->clear();
-    delete _menu_chain;
 #endif
-    delete m_Background;
+
+    NUX_SAFE_DELETE(_menu_chain);
+    NUX_SAFE_DELETE(m_Background);
   }
 
   WindowCompositor::RenderTargetTextures& WindowCompositor::GetWindowBuffer(BaseWindow* window)
@@ -1348,10 +1356,10 @@
       //int w, h;
       window_thread_->GetGraphicsEngine().GetContextSize(m_Width, m_Height);
       window_thread_->GetGraphicsEngine().SetViewport(0, 0, m_Width, m_Height);
-      
+
       // Reset the Model view Matrix and the projection matrix
       window_thread_->GetGraphicsEngine().ResetProjectionMatrix();
-      
+
       window_thread_->GetGraphicsEngine().ResetModelViewMatrixStack();
       window_thread_->GetGraphicsEngine().Push2DTranslationModelViewMatrix(0.0f, 0.0f, 0.0f);
 
@@ -1694,8 +1702,14 @@
     window_thread_->GetGraphicsEngine().SetViewport(0, 0, window_width, window_height);
     window_thread_->GetGraphicsEngine().SetOrthographicProjectionMatrix(window_width, window_height);
 
-    PresentBufferToScreen(m_MainColorRT, 0, 0, false);
+     // PresentBufferToScreen(m_MainColorRT, 0, 0, false);
+    Geometry geo(0, 0, m_MainColorRT->GetWidth(), m_MainColorRT->GetHeight());
+    window_thread_->GetGraphicsEngine().GetRenderStates().SetBlend(false);
+    scene_composer_->RenderTexture(m_MainColorRT, geo, geo);
 
+    //writes in the back buffer - it might override the directed textures!! we need to get rid
+    //of the directed unless if they have different z values when we switch to 3d rendering
+    RenderRedirected();
   }
 
   void WindowCompositor::PresentBufferToScreen(ObjectPtr<IOpenGLBaseTexture> HWTexture, int x, int y, bool RenderToMainTexture, bool /* BluredBackground */, float opacity, bool premultiply)
@@ -2214,7 +2228,7 @@
       nuxDebugMsg("[WindowCompositor::GrabPointerAdd] The area already has the grab");
       return result;
     }
-    
+
     if (window_thread_->GetGraphicsDisplay().PointerGrabData() != this)
       result = window_thread_->GetGraphicsDisplay().GrabPointer(NULL, this, true);
 
@@ -2240,10 +2254,10 @@
       return false;
 
     pointer_grab_stack_.erase(it);
-    
+
     if (pointer_grab_stack_.empty())
       window_thread_->GetGraphicsDisplay().UngrabPointer(this);
-    
+
     // reset the mouse pointers areas.
     ResetMousePointerAreas();
 
@@ -2286,7 +2300,7 @@
     {
       result = window_thread_->GetGraphicsDisplay().GrabKeyboard(NULL, this, true);
     }
-    
+
     if (result)
     {
       InputArea* current_keyboard_grab = GetKeyboardGrabArea();
@@ -2294,7 +2308,7 @@
         current_keyboard_grab->end_keyboard_grab.emit(current_keyboard_grab);
 
       keyboard_grab_stack_.push_front(area);
-      
+
       // If there is any area with the key focus, cancel it.
       if (key_focus_area_.IsValid())
       {
@@ -2324,7 +2338,7 @@
 
       area->start_keyboard_grab.emit(area);
     }
-    
+
     return result;
   }
 
@@ -2342,7 +2356,7 @@
 
     InputArea* current_keyboard_grab = (*it);
     bool has_grab = false;
-    
+
     if (it == keyboard_grab_stack_.begin())
     {
       // At the top of the keyboard_grab_stack_. Means it has the keyboard grab.
@@ -2384,7 +2398,7 @@
           key_focus_area_->key_nav_focus_change.emit(key_focus_area_.GetPointer(), false, KEY_NAV_NONE);
           // nuxDebugMsg("[WindowCompositor::GrabKeyboardRemove] Area type '%s' named '%s': Lost key nav focus.",
           //   key_focus_area_->Type().name,
-          //   key_focus_area_->GetBaseString().c_str());          
+          //   key_focus_area_->GetBaseString().c_str());
         }
 
         if (key_focus_area_->Type().IsDerivedFromType(View::StaticObjectType))
@@ -2393,14 +2407,14 @@
         }
         key_focus_area_ = NULL;
       }
-            
+
       it = keyboard_grab_stack_.begin();
       SetKeyFocusArea(*it);
 
       InputArea* new_keyboard_grab = (*it);
       new_keyboard_grab->start_keyboard_grab.emit(new_keyboard_grab);
     }
-    
+
     return true;
   }
 
@@ -2425,6 +2439,45 @@
     return (*keyboard_grab_stack_.begin());
   }
 
+/*  Redirected */
+
+  void WindowCompositor::QueueRedirected(const RedirectedArea &ra)
+  {
+    redirected_areas.push_back(ra);
+  }
+
+  void WindowCompositor::RenderRedirected()
+  {
+    if (redirected_areas.size() == 0)
+    {
+      // Nothing o render
+      return;
+    }
+
+    for (int i = redirected_areas.size() - 1; i >= 0; --i)
+    {
+      //render to the back buffer
+      scene_composer_->SetDestinationTexture(ObjectPtr<IOpenGLBaseTexture>());
+      scene_composer_->SetOrthoGraphicProjection();
+
+      RedirectedArea ra = redirected_areas[i];
+
+      //if (blend)
+      {
+        GetGraphicsDisplay()->GetGraphicsEngine()->GetRenderStates().SetBlend(true, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
+      }
+
+      scene_composer_->RenderTexture(ra.backup_texture, ra.geometry, ra.clipping_region);
+
+      //if (blend)
+      {
+        GetGraphicsDisplay()->GetGraphicsEngine()->GetRenderStates().SetBlend(false);
+      }
+    }
+
+    redirected_areas.clear();
+  }
+
   void WindowCompositor::SetReferenceFramebuffer(unsigned int fbo_object, Geometry fbo_geometry)
   {
     reference_fbo_ = fbo_object;
 
=== modified file 'Nux/WindowCompositor.h'
--- Nux/WindowCompositor.h	2012-11-27 17:18:13 +0000
+++ Nux/WindowCompositor.h	2012-12-17 15:42:23 +0000
@@ -47,6 +47,15 @@
   class Area;
   class PaintLayer;
   class Event;
+  class SceneComposer;
+
+  struct RedirectedArea
+  {
+    ObjectPtr<IOpenGLBaseTexture> backup_texture;
+    Geometry geometry;
+    Rect clipping_region;
+    Area* area;
+  };
 
   //! A user interface composition class created by WindowThread.
   class WindowCompositor : public sigc::trackable
@@ -64,7 +73,7 @@
     Geometry GetTooltipMainWindowGeometry() const;
 
 //     bool MouseDown(Point pt);
-// 
+//
 //     bool MouseMove(Point pt);
 //     bool MouseUp(Point pt);
 
@@ -231,8 +240,11 @@
     sigc::signal<void, Area*> key_nav_focus_activate;
 
     //====================================
-  
+
   public:
+    void QueueRedirected(const RedirectedArea &ra);
+    void RenderRedirected();
+
     /*!
         Set and external fbo to draw Nux BaseWindow into. This external fbo will be
         restored after Nux completes it rendering. The external fbo is used only in embedded mode. \n
@@ -566,6 +578,8 @@
   private:
     WindowThread* window_thread_; //!< The WindowThread to which this object belongs.
 
+    SceneComposer* scene_composer_;
+
 #ifdef NUX_GESTURES_SUPPORT
     std::unique_ptr<GestureBroker> gesture_broker_;
 #endif
@@ -583,6 +597,8 @@
     // Declare operator address-of as private
     WindowCompositor* operator & ();
 
+    std::vector<RedirectedArea> redirected_areas;
+
     friend class InputArea;
     friend class WindowThread;
     friend class TimerHandler;
 
=== modified file 'NuxCore/NuxCore.cpp'
--- NuxCore/NuxCore.cpp	2012-10-10 22:46:50 +0000
+++ NuxCore/NuxCore.cpp	2012-12-17 15:42:23 +0000
@@ -49,8 +49,8 @@
   unsigned int GetVariableArgs ( TCHAR *Dest, unsigned int /* Size */, unsigned int Count, const TCHAR*& Fmt, va_list ArgPtr)
 #endif
   {
-    unsigned int Result = VSNTPRINTF_S (Dest, Size, Count, Fmt, ArgPtr);
-    va_end (ArgPtr);
+    unsigned int Result = VSNTPRINTF_S(Dest, Size, Count, Fmt, ArgPtr);
+    va_end(ArgPtr);
     return Result;
   }
 
@@ -61,7 +61,7 @@
 #endif
   {
     unsigned int Result = VSNPRINTF_S (Dest, Size, Count, Fmt, ArgPtr);
-    va_end (ArgPtr);
+    va_end(ArgPtr);
     return Result;
   }
 
 
=== modified file 'NuxGraphics/GLRenderStates.h'
--- NuxGraphics/GLRenderStates.h	2012-10-15 05:05:27 +0000
+++ NuxGraphics/GLRenderStates.h	2012-12-17 15:42:23 +0000
@@ -237,7 +237,7 @@
       unsigned int& bGreen,
       unsigned int& bBlue,
       unsigned int& bAlpha);
-    
+
     inline void SetDepthMask(unsigned int bDepth = TRUE);
 
     inline void EnableScissor(unsigned int bScissor = FALSE);
 
=== modified file 'NuxGraphics/GraphicsEngine.cpp'
--- NuxGraphics/GraphicsEngine.cpp	2012-11-28 15:16:41 +0000
+++ NuxGraphics/GraphicsEngine.cpp	2012-12-17 15:42:23 +0000
@@ -1105,7 +1105,7 @@
 //   {
 //     return Rect(_viewport.x, _viewport.y, _viewport.width, _viewport.height);
 //   }
-  
+
   Rect GraphicsEngine::GetViewportRect() const
   {
     return _viewport;
 
=== modified file 'NuxGraphics/RenderingPipeGLSL.cpp'
--- NuxGraphics/RenderingPipeGLSL.cpp	2012-11-12 20:59:56 +0000
+++ NuxGraphics/RenderingPipeGLSL.cpp	2012-12-17 15:42:23 +0000
@@ -36,7 +36,7 @@
     ObjectPtr<IOpenGLVertexShader> VS = _graphics_display.m_DeviceFactory->CreateVertexShader();
     ObjectPtr<IOpenGLPixelShader> PS = _graphics_display.m_DeviceFactory->CreatePixelShader();
 
-    const char* VSString =  
+    const char* VSString =
       NUX_VERTEX_SHADER_HEADER
       "uniform mat4 ViewProjectionMatrix;                \n\
       attribute vec4 AVertex;                            \n\
@@ -50,7 +50,7 @@
 
     VS->SetShaderCode(TCHAR_TO_ANSI(VSString));
 
-    const char* PSString =  
+    const char* PSString =
       NUX_FRAGMENT_SHADER_HEADER
       "varying vec4 vColor;           \n\
       void main()                    \n\
@@ -71,7 +71,7 @@
     ObjectPtr<IOpenGLVertexShader> VS = _graphics_display.m_DeviceFactory->CreateVertexShader();
     ObjectPtr<IOpenGLPixelShader> PS = _graphics_display.m_DeviceFactory->CreatePixelShader();
 
-    const char* VSString =  
+    const char* VSString =
         NUX_VERTEX_SHADER_HEADER
         "attribute vec4 AVertex;                                \n\
         attribute vec4 MyTextureCoord0;                         \n\
@@ -86,7 +86,7 @@
         varyVertexColor = VertexColor;                          \n\
         }";
 
-    const char* PSString =  
+    const char* PSString =
         NUX_FRAGMENT_SHADER_HEADER
         "varying vec4 varyTexCoord0;                                \n\
         varying vec4 varyVertexColor;                               \n\
@@ -118,7 +118,7 @@
     ObjectPtr<IOpenGLVertexShader> VS = _graphics_display.m_DeviceFactory->CreateVertexShader();
     ObjectPtr<IOpenGLPixelShader> PS = _graphics_display.m_DeviceFactory->CreatePixelShader();
 
-    const char* VSString =  
+    const char* VSString =
                      NUX_VERTEX_SHADER_HEADER
                      "attribute vec4 AVertex;                                 \n\
                      attribute vec4 MyTextureCoord0;                         \n\
@@ -133,7 +133,7 @@
                      varyVertexColor = VertexColor;                          \n\
                      }";
 
-    const char* PSString =  
+    const char* PSString =
                     NUX_FRAGMENT_SHADER_HEADER
                     "varying vec4 varyTexCoord0;                                        \n\
                      varying vec4 varyVertexColor;                                      \n\
@@ -571,7 +571,7 @@
     ObjectPtr<IOpenGLVertexShader> VS = _graphics_display.m_DeviceFactory->CreateVertexShader();
     ObjectPtr<IOpenGLPixelShader> PS = _graphics_display.m_DeviceFactory->CreatePixelShader();
 
-    const char* VSString = 
+    const char* VSString =
                       NUX_VERTEX_SHADER_HEADER
                      "uniform mat4 ViewProjectionMatrix;   \n\
                      attribute vec4 AVertex;              \n\
@@ -587,7 +587,7 @@
                      }";
 
 
-    const char* PSString = 
+    const char* PSString =
                     NUX_FRAGMENT_SHADER_HEADER
                      "varying vec4 varyTexCoord0;                                  \n\
                      varying vec4 varyVertexColor;                                \n\
@@ -635,7 +635,7 @@
     ObjectPtr<IOpenGLVertexShader> VS = _graphics_display.m_DeviceFactory->CreateVertexShader();
     ObjectPtr<IOpenGLPixelShader> PS = _graphics_display.m_DeviceFactory->CreatePixelShader();
 
-    const char* VSString = 
+    const char* VSString =
                       NUX_VERTEX_SHADER_HEADER
         "uniform mat4 ViewProjectionMatrix;  \n\
         attribute vec4 AVertex;             \n\
@@ -647,7 +647,7 @@
           gl_Position =  ViewProjectionMatrix * (AVertex);  \n\
         }";
 
-    const char* PSString = 
+    const char* PSString =
                     NUX_FRAGMENT_SHADER_HEADER
         "varying vec4 varyTexCoord0;                                 \n\
         uniform sampler2D TextureObject0;                           \n\