Merge lp:~unity-team/nux/nux.setkeyfocusarea into lp:nux/2.0

[Jay Taoko]

* Updated nux_abi_version.
* Moved Area::AcceptKeyNavFocus to InputArea::AcceptKeyNavFocus.
* Remove the calls to Area::EmitStartKeyboardFocus, Area::EmitEndKeyboardFocus.
* WindowCompositor::SetKeyFocusArea returns a bool.
* Prevent WindowCompositor::SetKeyFocusArea from emitting begin_key_focus twice.

[lp:~unity-team/nux/nux.setkeyfocusarea]

582. By Jay Taoko on 2012-02-19

* Added WindowCompositor::SetKeyFocusArea test.
* Addes TestView class to nux namespace.

583. By Jay Taoko on 2012-02-20

* Missing test file.

[Andrea Azzarone (azzar1)]

Looks good to me.

Later we can ass an SetAcceptKeyNavFocus function.

review: Approve

[Andrea Azzarone (azzar1)]

> Looks good to me.
>
> Later we can ass an SetAcceptKeyNavFocus function.

Add :)

[Jay Taoko (jaytaoko)]

hahaha! :)

=== modified file 'Nux/Area.cpp'
--- Nux/Area.cpp	2012-02-17 20:46:05 +0000
+++ Nux/Area.cpp	2012-02-20 02:53:17 +0000
@@ -999,14 +999,6 @@
     return false;
   }
 
-  bool Area::AcceptKeyNavFocus()
-  {
-    if (GetInputEventSensitivity() == false)
-      return false;
-
-    return true;
-  }
-
   Area* Area::KeyNavIteration(KeyNavDirection direction)
   {
     return NULL;

=== modified file 'Nux/Area.h'
--- Nux/Area.h	2012-02-17 20:46:05 +0000
+++ Nux/Area.h	2012-02-20 02:53:17 +0000
@@ -496,8 +496,21 @@
         unsigned long x11_key_code,
         unsigned long special_keys_state);
 
+    /*!
+        Mark the path from this area to its top level parent as the one to follow \n
+        to get to the area that has the keyboard.
+    */
     void SetPathToKeyFocusArea();
+
+    /*!
+        Erase the path from this area to the child area that has the keyboard.
+    */
     void ResetDownwardPathToKeyFocusArea();
+
+    /*!
+        Erase the path that marks this object as part of the keyboard focus chain, \n
+        from this area to its top level parent.
+    */
     void ResetUpwardPathToKeyFocusArea();
 
     //! Return True if the the area knows what to do with the key event.
@@ -514,8 +527,6 @@
       unsigned int keysym,
       const char* character);
 
-    virtual bool AcceptKeyNavFocus();
-
     virtual Area* KeyNavIteration(KeyNavDirection direction);
 
     bool HasKeyFocus() const;
@@ -593,17 +604,14 @@
     //! Return the absolute geometry starting with a relative geometry passed as argument.
     void InnerGetRootGeometry(Geometry &geometry);
 
-//     //! Add a "secondary" child to this Area. The
-//     /*!
-//         @return True if the child has been added; False otherwise;
-//     */
-//     bool Secondary(Area *child);
-   
     bool on_geometry_change_reconfigure_parent_layout_;
 
-    bool                    has_key_focus_;
-
-    Area                    *next_object_to_key_focus_area_;
+    //! If this variable is true, then this area has the keyboard focus.
+    bool has_key_focus_;
+
+    //! If this variable is not NULL, then this area is part of the keyboard focus chain.
+    Area* next_object_to_key_focus_area_;
+
   private:
     void ReconfigureParentLayout(Area *child = 0);
     void CheckMinSize();
@@ -619,7 +627,7 @@
         An object of the class Layout may have a parent of the class Layout or View as parent.
         A Area cannot have children(that may change later).
     */
-    Area                    *parent_area_;
+    Area*             parent_area_;
 
     bool              visible_;       //!< Visible state of the area.
     bool              sensitive_;     //!< Input sensitive state of the area

=== modified file 'Nux/InputArea.cpp'
--- Nux/InputArea.cpp	2012-02-17 20:46:05 +0000
+++ Nux/InputArea.cpp	2012-02-20 02:53:17 +0000
@@ -350,17 +350,6 @@
     mouse_double_click.emit(x, y, mouse_button_state, special_keys_state);
   }
 
-
-  void InputArea::EmitStartKeyboardFocus()
-  {
-    begin_key_focus.emit();
-  }
-
-  void InputArea::EmitEndKeyboardFocus()
-  {
-    end_key_focus.emit();
-  }
-
   void InputArea::EmitMouseDownOutsideArea(int x, int y, unsigned long mouse_button_state, unsigned long special_keys_state)
   {
     mouse_down_outside_pointer_grab_area.emit(x, y, mouse_button_state, special_keys_state);
@@ -414,5 +403,13 @@
   {
     accept_key_nav_focus_on_mouse_enter_ = accept;
   }
+
+  bool InputArea::AcceptKeyNavFocus() const
+  {
+    if (GetInputEventSensitivity() == false)
+      return false;
+
+    return true;
+  }  
 }
 

=== modified file 'Nux/InputArea.h'
--- Nux/InputArea.h	2012-02-17 20:46:05 +0000
+++ Nux/InputArea.h	2012-02-20 02:53:17 +0000
@@ -69,6 +69,8 @@
                           unsigned long x11_key_code,
                           unsigned long special_keys_state);
 
+    virtual bool AcceptKeyNavFocus() const;
+    
   protected:
 
   private:
@@ -337,9 +339,6 @@
       virtual void EmitMouseClickSignal       (int x, int y, unsigned long mouse_button_state, unsigned long special_keys_state);
       virtual void EmitMouseDoubleClickSignal(int x, int y, unsigned long mouse_button_state, unsigned long special_keys_state);
 
-      virtual void EmitStartKeyboardFocus();
-      virtual void EmitEndKeyboardFocus();
-
       virtual void EmitMouseDownOutsideArea   (int x, int y, unsigned long mouse_button_state, unsigned long special_keys_state);
 
       friend class WindowCompositor;

=== modified file 'Nux/ProgramFramework/TestView.cpp'
--- Nux/ProgramFramework/TestView.cpp	2012-01-30 08:43:49 +0000
+++ Nux/ProgramFramework/TestView.cpp	2012-02-20 02:53:17 +0000
@@ -26,7 +26,7 @@
     This class is a Nux view that processes all mouse events that it receives. It is meant for testing simulated
     mouse events. 
 */
-
+namespace nux {
 NUX_IMPLEMENT_OBJECT_TYPE(TestView);
 
 TestView::TestView(NUX_FILE_LINE_DECL)
@@ -34,6 +34,7 @@
 , can_focus_(true)
 {
   ResetEvents();
+  ResetKeyFocusEvents();
 
   key_nav_direction_ = nux::KEY_NAV_NONE;
   normal_color_ = nux::color::Green;
@@ -58,6 +59,9 @@
   mouse_enter.connect(sigc::mem_fun(this, &TestView::OnMouseEnter));
   mouse_leave.connect(sigc::mem_fun(this, &TestView::OnMouseLeave));
   key_nav_focus_change.connect(sigc::mem_fun(this, &TestView::OnKeyNavFocusChange));
+  begin_key_focus.connect(sigc::mem_fun(this, &TestView::OnBeginKeyFocus));
+  end_key_focus.connect(sigc::mem_fun(this, &TestView::OnEndKeyFocus));
+
 }
 
 TestView::~TestView()
@@ -80,6 +84,12 @@
     
 }
 
+void TestView::ResetKeyFocusEvents()
+{
+  registered_begin_keynav_focus_ = false;
+  registered_end_keynav_focus_ = false;
+}
+
 nux::Color TestView::GetColor() const
 {
   return current_color_;
@@ -167,3 +177,15 @@
   key_nav_direction_ = direction;
   QueueDraw();
 }
+
+void TestView::OnBeginKeyFocus()
+{
+  registered_begin_keynav_focus_ = true;
+}
+
+void TestView::OnEndKeyFocus()
+{
+  registered_end_keynav_focus_ = true;
+}
+
+}

=== modified file 'Nux/ProgramFramework/TestView.h'
--- Nux/ProgramFramework/TestView.h	2012-01-30 08:43:49 +0000
+++ Nux/ProgramFramework/TestView.h	2012-02-20 02:53:17 +0000
@@ -23,6 +23,7 @@
 
 #include "Nux/TextureArea.h"
 
+namespace nux {
 class TestView: public nux::View
 {
   NUX_DECLARE_OBJECT_TYPE(TestView, View);
@@ -34,6 +35,7 @@
   bool AcceptKeyNavFocus() {return can_focus_;}
 
   void ResetEvents();
+  void ResetKeyFocusEvents();
 
   bool can_focus_;
 
@@ -46,6 +48,9 @@
   bool registered_mouse_move_;
   bool registered_mouse_enter_;
   bool registered_mouse_leave_;
+  
+  bool registered_begin_keynav_focus_;
+  bool registered_end_keynav_focus_;
 
   nux::KeyNavDirection key_nav_direction_; //!< The key nav direction received when the view obtained the focus.
   
@@ -71,9 +76,12 @@
   void OnMouseEnter(int x, int y, unsigned long button_flags, unsigned long key_flags);
   void OnMouseLeave(int x, int y, unsigned long button_flags, unsigned long key_flags);
   void OnKeyNavFocusChange(nux::Area* area, bool has_focus, nux::KeyNavDirection direction);
+  void OnBeginKeyFocus();
+  void OnEndKeyFocus();
 
   void Draw(nux::GraphicsEngine& graphics_engine, bool force_draw);
 };
 
+}
 #endif // TEST_VIEW_H
 

=== modified file 'Nux/WindowCompositor.cpp'
--- Nux/WindowCompositor.cpp	2012-02-17 13:40:03 +0000
+++ Nux/WindowCompositor.cpp	2012-02-20 02:53:17 +0000
@@ -1844,7 +1844,7 @@
     }
   }
   
-  void WindowCompositor::SetKeyFocusArea(InputArea* area, KeyNavDirection direction)
+  bool WindowCompositor::SetKeyFocusArea(InputArea* area, KeyNavDirection direction)
   {
     InputArea* keyboard_grab_area = GetKeyboardGrabArea();
 
@@ -1853,22 +1853,28 @@
       // There is a keyboard grab pending. Only an area that is a child of the area that has
       // the keyboard grab can be set to receive keyboard events.
       nuxDebugMsg("[WindowCompositor::SetKeyFocusArea] There is a keyboard grab pending. Cannot change the keyboard event receiver.");
-      return;
+      return false;
     }
 
     if (key_focus_area_ == area)
     {
-      return;
+      // Already has the keyboard focus.
+      return true;
     }
 
     if (area && (area->AcceptKeyNavFocus() == false))
     {
-      return;
+      // Area does not want the keyboard focus.
+      return false;
     }
 
     if (key_focus_area_)
     {
-      key_focus_area_->EmitEndKeyboardFocus();
+      // This is the area that has the keyboard focus. Emit the signal 'end_key_focus'.
+      key_focus_area_->end_key_focus.emit();
+
+      // From the area that has the keyboard focus to the top level parent, delete the path that
+      // leads to the keyboard focus area.
       key_focus_area_->ResetUpwardPathToKeyFocusArea();
 
       if (key_focus_area_->Type().IsDerivedFromType(InputArea::StaticObjectType))
@@ -1889,8 +1895,12 @@
     {
       key_focus_area_ = area;
 
+      // From the area that has the keyboard focus to the top level parent, mark the path that
+      // leads to the keyboard focus area.
       key_focus_area_->SetPathToKeyFocusArea();
-      key_focus_area_->EmitStartKeyboardFocus();
+
+      // Emit the signal 'begin_key_focus'.
+      key_focus_area_->begin_key_focus.emit();
 
       if (key_focus_area_->Type().IsDerivedFromType(InputArea::StaticObjectType))
       {
@@ -1913,20 +1923,19 @@
       key_focus_area_ = NULL;
     }
 
-    // Even if the the area parameter cannot receive keyboard events, it will get the
-    // keyboard navigatiuon focus.
-
-    if (key_focus_area_)
-    {
-      key_focus_area_->begin_key_focus.emit();
-    }
-
-
     key_focus_area_connection_.disconnect();
+
     if (area)
     {
       key_focus_area_connection_ = area->object_destroyed.connect(sigc::mem_fun(this, &WindowCompositor::OnKeyNavFocusDestroyed));
     }
+
+    if (key_focus_area_ == NULL)
+    {
+      return false;
+    }
+
+    return true;
   }
 
   InputArea* WindowCompositor::GetKeyFocusArea()
@@ -2189,7 +2198,7 @@
       // If there is any area with the key focus, cancel it.
       if (key_focus_area_)
       {
-        key_focus_area_->EmitEndKeyboardFocus();
+        key_focus_area_->end_key_focus.emit();
         key_focus_area_->ResetUpwardPathToKeyFocusArea();
 
         if (key_focus_area_->Type().IsDerivedFromType(InputArea::StaticObjectType))
@@ -2260,7 +2269,7 @@
       // If there is any area with the key focus, cancel it.
       if (key_focus_area_)
       {
-        key_focus_area_->EmitEndKeyboardFocus();
+        key_focus_area_->end_key_focus.emit();
         key_focus_area_->ResetUpwardPathToKeyFocusArea();
 
         if (key_focus_area_->Type().IsDerivedFromType(InputArea::StaticObjectType))

=== modified file 'Nux/WindowCompositor.h'
--- Nux/WindowCompositor.h	2012-01-28 01:05:44 +0000
+++ Nux/WindowCompositor.h	2012-02-20 02:53:17 +0000
@@ -85,12 +85,15 @@
 
     //! Set the area that has the keyboard focus.
     /*!
-        Set the area that has the keyboard focus.
+        Set the area that has the keyboard focus. If the \i area parameter is NULL, \n
+        the area that has the keyboard focus looses it and the function returns false.
 
         @param The area that that gets the keyboard focus.
         @param The key nav direction that initiated the focus to the provided area.
+
+        @return True if the area succeeded to get the keyboard focus or it already has it.
     */
-    void SetKeyFocusArea(InputArea* area, KeyNavDirection direction = KEY_NAV_NONE);
+    bool SetKeyFocusArea(InputArea* area, KeyNavDirection direction = KEY_NAV_NONE);
 
     //! Return the area that has the keyboard focus.
     /*!

=== modified file 'configure.ac'
--- configure.ac	2012-02-19 06:58:01 +0000
+++ configure.ac	2012-02-20 02:53:17 +0000
@@ -22,7 +22,7 @@
 # The number format is : year/month/day
 # e.g.: december 5th, 2011 is: 20111205
 # To make more than one API change in a day, add a number to the date. Like 20111205.xx
-m4_define([nux_abi_version], [20120218.02])
+m4_define([nux_abi_version], [20120219.01])
 
 m4_define([nux_version],
           [nux_major_version.nux_minor_version.nux_micro_version])

=== modified file 'tests/Makefile.am'
--- tests/Makefile.am	2012-02-17 13:18:35 +0000
+++ tests/Makefile.am	2012-02-20 02:53:17 +0000
@@ -84,8 +84,10 @@
   test-nux-main.cpp \
   test-nux-metrics.cpp \
   test-nux-statictext.cpp \
+  gtest-nux-windowcompositor.cpp \
   test-nux-windowthread.cpp
 
+
 gtest_nux_CPPFLAGS = \
   -I$(srcdir) \
   -I$(top_srcdir) \

=== added file 'tests/gtest-nux-windowcompositor.cpp'
--- tests/gtest-nux-windowcompositor.cpp	1970-01-01 00:00:00 +0000
+++ tests/gtest-nux-windowcompositor.cpp	2012-02-20 02:53:17 +0000
@@ -0,0 +1,64 @@
+#include <string>
+#include <fstream>
+
+#include <iostream>
+#include <gmock/gmock.h>
+#include <boost/filesystem.hpp>
+#include <glib.h>
+
+#include "Nux/Nux.h"
+#include "Nux/HLayout.h"
+#include "Nux/ProgramFramework/TestView.h"
+
+using namespace testing;
+
+namespace {
+
+TEST(TestWindowCompositor, TestSetKeyFocusArea)
+{
+  nux::NuxInitialize(0);
+  nux::WindowThread *wnd_thread = nux::CreateNuxWindow("Nux Window", 300, 200,
+    nux::WINDOWSTYLE_NORMAL, NULL, false, NULL, NULL);
+
+  nux::TestView* test_view0 = new nux::TestView();
+  nux::TestView* test_view1 = new nux::TestView();
+
+  nux::HLayout* layout = new nux::HLayout();
+  
+  layout->AddView(test_view0, 1);
+  layout->AddView(test_view1, 1);
+
+  wnd_thread->SetLayout(layout);
+
+  // Set keyboard focus on test_view0
+  {
+    wnd_thread->GetWindowCompositor().SetKeyFocusArea(test_view0);
+
+    // Check that test_view0 has registered a keynav focus event
+    EXPECT_EQ(test_view0->registered_begin_keynav_focus_, true);
+    EXPECT_EQ(test_view0->registered_end_keynav_focus_, false);
+
+    EXPECT_EQ(test_view1->registered_begin_keynav_focus_, false);
+    EXPECT_EQ(test_view1->registered_end_keynav_focus_, false);
+
+    test_view0->ResetKeyFocusEvents();
+  }
+
+  // Set keyboard focus on test_view1
+  {
+    wnd_thread->GetWindowCompositor().SetKeyFocusArea(test_view1);
+
+    EXPECT_EQ(test_view0->registered_begin_keynav_focus_, false);
+    // Check that test_view0 has loast the keynav focus.
+    EXPECT_EQ(test_view0->registered_end_keynav_focus_, true);
+
+    // Check that test_view1 has registered a keynav focus event
+    EXPECT_EQ(test_view1->registered_begin_keynav_focus_, true);
+    EXPECT_EQ(test_view1->registered_end_keynav_focus_, false);
+  }
+
+  delete wnd_thread;
+}
+
+
+}

=== modified file 'tests/xtest-focus-on-mouse-down.cpp'
--- tests/xtest-focus-on-mouse-down.cpp	2012-01-27 22:37:13 +0000
+++ tests/xtest-focus-on-mouse-down.cpp	2012-02-20 02:53:17 +0000
@@ -35,8 +35,8 @@
 
   virtual void UserInterfaceSetup();
   
-  TestView* focus_view_;
-  TestView* no_focus_view_;
+  nux::TestView* focus_view_;
+  nux::TestView* no_focus_view_;
 };
 
 FocusOnMouseDownTest::FocusOnMouseDownTest(const char* program_name,
@@ -59,12 +59,12 @@
   main_layout->SetSpaceBetweenChildren(10);
   main_layout->SetPadding(10, 10);
   
-  focus_view_ = new TestView(NUX_TRACKER_LOCATION);
+  focus_view_ = new nux::TestView(NUX_TRACKER_LOCATION);
   focus_view_->can_focus_ = true;
   focus_view_->SetAcceptKeyNavFocusOnMouseDown(true);
   main_layout->AddView(focus_view_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
     
-  no_focus_view_ = new TestView(NUX_TRACKER_LOCATION);
+  no_focus_view_ = new nux::TestView(NUX_TRACKER_LOCATION);
   no_focus_view_->can_focus_ = true;
   no_focus_view_->SetAcceptKeyNavFocusOnMouseDown(false);
   main_layout->AddView(no_focus_view_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);

=== modified file 'tests/xtest-focus-on-mouse-enter.cpp'
--- tests/xtest-focus-on-mouse-enter.cpp	2012-02-17 13:43:55 +0000
+++ tests/xtest-focus-on-mouse-enter.cpp	2012-02-20 02:53:17 +0000
@@ -35,8 +35,8 @@
 
   virtual void UserInterfaceSetup();
 
-  TestView* focus_view_;
-  TestView* no_focus_view_;
+  nux::TestView* focus_view_;
+  nux::TestView* no_focus_view_;
 };
 
 FocusOnMouseEnterTest::FocusOnMouseEnterTest(const char* program_name,
@@ -58,12 +58,12 @@
   main_layout->SetSpaceBetweenChildren(10);
   main_layout->SetPadding(10, 10);
 
-  no_focus_view_ = new TestView(NUX_TRACKER_LOCATION);
+  no_focus_view_ = new nux::TestView(NUX_TRACKER_LOCATION);
   no_focus_view_->can_focus_ = true;
   no_focus_view_->SetAcceptKeyNavFocusOnMouseEnter(false);
   main_layout->AddView(no_focus_view_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
-  focus_view_ = new TestView(NUX_TRACKER_LOCATION);
+  focus_view_ = new nux::TestView(NUX_TRACKER_LOCATION);
   focus_view_->can_focus_ = true;
   focus_view_->SetAcceptKeyNavFocusOnMouseEnter(true);
   main_layout->AddView(focus_view_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);

=== modified file 'tests/xtest-hgrid-key-navigation.cpp'
--- tests/xtest-hgrid-key-navigation.cpp	2012-02-13 11:21:48 +0000
+++ tests/xtest-hgrid-key-navigation.cpp	2012-02-20 02:53:17 +0000
@@ -40,11 +40,11 @@
 
   virtual void UserInterfaceSetup();
   
-  TestView* CreateTile();
-  void AddTile(TestView* tile);
+  nux::TestView* CreateTile();
+  void AddTile(nux::TestView* tile);
   
   nux::GridHLayout* grid_layout_;
-  TestView* tiles_[11];
+  nux::TestView* tiles_[11];
 };
 
 HGridKeyNavigationTest::HGridKeyNavigationTest(const char* program_name,
@@ -59,13 +59,13 @@
 {
 }
 
-TestView* HGridKeyNavigationTest::CreateTile()
+nux::TestView* HGridKeyNavigationTest::CreateTile()
 {
-  TestView* tile = new TestView();
+  nux::TestView* tile = new nux::TestView();
   return tile;
 }
 
-void HGridKeyNavigationTest::AddTile(TestView* tile)
+void HGridKeyNavigationTest::AddTile(nux::TestView* tile)
 {
   grid_layout_->AddView(tile, 1);
 }

=== modified file 'tests/xtest-hlayout-key-navigation.cpp'
--- tests/xtest-hlayout-key-navigation.cpp	2012-01-27 22:37:13 +0000
+++ tests/xtest-hlayout-key-navigation.cpp	2012-02-20 02:53:17 +0000
@@ -38,11 +38,11 @@
 
   virtual void UserInterfaceSetup();
   
-  TestView* CreateView();
-  void AddView(TestView* view);
+  nux::TestView* CreateView();
+  void AddView(nux::TestView* view);
   
   nux::HLayout* hlayout_;
-  TestView* views_[NUM_VIEWS];
+  nux::TestView* views_[NUM_VIEWS];
 };
 
 HLayoutKeyNavigationTest::HLayoutKeyNavigationTest(const char* program_name,
@@ -57,13 +57,13 @@
 {
 }
 
-TestView* HLayoutKeyNavigationTest::CreateView()
+nux::TestView* HLayoutKeyNavigationTest::CreateView()
 {
-  TestView* view = new TestView();
+  nux::TestView* view = new nux::TestView();
   return view;
 }
 
-void HLayoutKeyNavigationTest::AddView(TestView* view)
+void HLayoutKeyNavigationTest::AddView(nux::TestView* view)
 {
   hlayout_->AddView(view, 1);
 }

=== modified file 'tests/xtest-keynav-directions.cpp'
--- tests/xtest-keynav-directions.cpp	2012-01-30 08:43:49 +0000
+++ tests/xtest-keynav-directions.cpp	2012-02-20 02:53:17 +0000
@@ -35,10 +35,10 @@
 
   virtual void UserInterfaceSetup();
   
-  TestView* view0_;
-  TestView* view1_;
-  TestView* view2_;
-  TestView* view3_;
+  nux::TestView* view0_;
+  nux::TestView* view1_;
+  nux::TestView* view2_;
+  nux::TestView* view3_;
 
 };
 
@@ -69,22 +69,22 @@
   layout0->SetSpaceBetweenChildren(10);
   layout1->SetSpaceBetweenChildren(10);
 
-  view0_ = new TestView(NUX_TRACKER_LOCATION);
+  view0_ = new nux::TestView(NUX_TRACKER_LOCATION);
   view0_->can_focus_ = true;
   view0_->SetAcceptKeyNavFocusOnMouseDown(true);
   layout0->AddView(view0_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
     
-  view1_ = new TestView(NUX_TRACKER_LOCATION);
+  view1_ = new nux::TestView(NUX_TRACKER_LOCATION);
   view1_->can_focus_ = true;
   view1_->SetAcceptKeyNavFocusOnMouseDown(true);
   layout0->AddView(view1_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
 
-  view2_ = new TestView(NUX_TRACKER_LOCATION);
+  view2_ = new nux::TestView(NUX_TRACKER_LOCATION);
   view2_->can_focus_ = true;
   view2_->SetAcceptKeyNavFocusOnMouseDown(true);
   layout1->AddView(view2_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
     
-  view3_ = new TestView(NUX_TRACKER_LOCATION);
+  view3_ = new nux::TestView(NUX_TRACKER_LOCATION);
   view3_->can_focus_ = true;
   view3_->SetAcceptKeyNavFocusOnMouseDown(true);
   layout1->AddView(view3_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);

=== modified file 'tests/xtest-mouse-buttons.cpp'
--- tests/xtest-mouse-buttons.cpp	2012-01-27 22:37:13 +0000
+++ tests/xtest-mouse-buttons.cpp	2012-02-20 02:53:17 +0000
@@ -37,7 +37,7 @@
   virtual void UserInterfaceSetup();
   
   void ResetEvents();
-  TestView* test_view_;
+  nux::TestView* test_view_;
 };
 
 ButtonEventsTest::ButtonEventsTest(const char* program_name,
@@ -64,7 +64,7 @@
 void ButtonEventsTest::UserInterfaceSetup()
 {
   nux::VLayout* main_layout = new nux::VLayout(NUX_TRACKER_LOCATION);
-  test_view_ = new TestView(NUX_TRACKER_LOCATION);
+  test_view_ = new nux::TestView(NUX_TRACKER_LOCATION);
 
   main_layout->AddView(test_view_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   main_layout->SetPadding(10, 10);

=== modified file 'tests/xtest-mouse-events.cpp'
--- tests/xtest-mouse-events.cpp	2012-01-27 22:37:13 +0000
+++ tests/xtest-mouse-events.cpp	2012-02-20 02:53:17 +0000
@@ -38,7 +38,7 @@
   virtual void UserInterfaceSetup();
   
   void ResetEvents();
-  TestView* test_view_;
+  nux::TestView* test_view_;
 };
 
 EventsTest::EventsTest(const char* program_name,
@@ -65,7 +65,7 @@
 void EventsTest::UserInterfaceSetup()
 {
   nux::VLayout* main_layout = new nux::VLayout(NUX_TRACKER_LOCATION);
-  test_view_ = new TestView(NUX_TRACKER_LOCATION);
+  test_view_ = new nux::TestView(NUX_TRACKER_LOCATION);
 
   main_layout->AddView(test_view_, 1, nux::MINOR_POSITION_CENTER, nux::MINOR_SIZE_FULL);
   main_layout->SetPadding(10, 10);

=== modified file 'tests/xtest-scrollbar.cpp'
--- tests/xtest-scrollbar.cpp	2012-01-27 22:37:13 +0000
+++ tests/xtest-scrollbar.cpp	2012-02-20 02:53:17 +0000
@@ -39,7 +39,7 @@
   nux::VLayout* layout_;
   TestScrollView* scroll_view_;
   nux::VLayout* in_layout_;
-  TestView* test_view_;
+  nux::TestView* test_view_;
 };
 
 ScrollBarTest::ScrollBarTest(const char* program_name,
@@ -65,7 +65,7 @@
   in_layout_ = new nux::VLayout(NUX_TRACKER_LOCATION);
   scroll_view_->SetLayout(in_layout_);
   
-  test_view_ = new TestView();
+  test_view_ = new nux::TestView();
   test_view_->SetMinimumHeight(1000);
   in_layout_->AddView(test_view_);
   

=== modified file 'tests/xtest-vlayout-key-navigation.cpp'
--- tests/xtest-vlayout-key-navigation.cpp	2012-01-27 22:37:13 +0000
+++ tests/xtest-vlayout-key-navigation.cpp	2012-02-20 02:53:17 +0000
@@ -38,11 +38,11 @@
 
   virtual void UserInterfaceSetup();
   
-  TestView* CreateView();
-  void AddView(TestView* view);
+  nux::TestView* CreateView();
+  void AddView(nux::TestView* view);
   
   nux::VLayout* vlayout_;
-  TestView* views_[NUM_VIEWS];
+  nux::TestView* views_[NUM_VIEWS];
 };
 
 VLayoutKeyNavigationTest::VLayoutKeyNavigationTest(const char* program_name,
@@ -57,13 +57,13 @@
 {
 }
 
-TestView* VLayoutKeyNavigationTest::CreateView()
+nux::TestView* VLayoutKeyNavigationTest::CreateView()
 {
-  TestView* view = new TestView();
+  nux::TestView* view = new nux::TestView();
   return view;
 }
 
-void VLayoutKeyNavigationTest::AddView(TestView* view)
+void VLayoutKeyNavigationTest::AddView(nux::TestView* view)
 {
   vlayout_->AddView(view, 1);
 }