Merge lp:~yeganeh/nux/fix-for-841864 into lp:nux

[Zaid Yeganeh]

[Jay Taoko (jaytaoko)]

The interface for activate/de-activate has changed in Nux 2.0. I will port the change over.

review: Approve

=== modified file 'Nux/AbstractButton.cpp'
--- Nux/AbstractButton.cpp	2011-09-20 06:03:43 +0000
+++ Nux/AbstractButton.cpp	2011-10-05 21:24:25 +0000
@@ -60,6 +60,9 @@
 
   void AbstractButton::RecvClick(int x, int y, unsigned long button_flags, unsigned long key_flags)
   {
+    if (!IsViewActive())
+      return;
+
     if(togglable_)
     {
       active = !active;
@@ -80,6 +83,9 @@
 
   void AbstractButton::RecvMouseUp(int x, int y, unsigned long button_flags, unsigned long key_flags)
   {
+    if (!IsViewActive())
+      return;
+
     state = NUX_STATE_PRELIGHT;
     //state = 1;
     QueueDraw();
@@ -87,6 +93,9 @@
 
   void AbstractButton::RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags)
   {
+    if (!IsViewActive())
+      return;
+
     state = NUX_STATE_ACTIVE;
     QueueDraw();
   }

=== modified file 'Nux/View.cpp'
--- Nux/View.cpp	2011-09-27 23:17:54 +0000
+++ Nux/View.cpp	2011-10-05 21:24:25 +0000
@@ -473,19 +473,24 @@
 
   void View::ActivateView ()
   {
+    _is_view_active = true;
+  }
+
+  void View::DeactivateView ()
+  {
     _is_view_active = false;
   }
 
-  void View::DeactivateView ()
-  {
-    _is_view_active = true;
-  }
-
   bool View::IsViewActive () const
   {
     return _is_view_active;
   }
 
+  void View::SetViewActive (bool active)
+  {
+    _is_view_active = active;
+  }
+
   void View::GeometryChangePending ()
   {
     QueueDraw ();

=== modified file 'Nux/View.h'
--- Nux/View.h	2011-09-20 06:03:43 +0000
+++ Nux/View.h	2011-10-05 21:24:25 +0000
@@ -113,6 +113,8 @@
     */
     bool IsViewActive () const;
 
+    void SetViewActive (bool active);
+
   public:
     virtual void ProcessDraw (GraphicsEngine &GfxContext, bool force_draw);
     //! Causes a redraw. The widget parameter _need_redraw is set to true. The widget Draw(), DrawContent() and PostDraw() are called.