X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpopup%2Fpopup-impl.h;h=91d68b787d392e93bc96c16394e93cb732e5622a;hp=c40811c5b71f5f29b1b18762c5229cff4a6190d3;hb=e9d852fcdacc5788785bfe0b617bd757794e8208;hpb=8ad943a28e16767f5fe2fc92d18b38f8808bdc99

diff --git a/dali-toolkit/internal/controls/popup/popup-impl.h b/dali-toolkit/internal/controls/popup/popup-impl.h
index c40811c..91d68b7 100755
--- a/dali-toolkit/internal/controls/popup/popup-impl.h
+++ b/dali-toolkit/internal/controls/popup/popup-impl.h
@@ -19,7 +19,6 @@
  */
 
 // EXTERNAL INCLUDES
-#include <dali/public-api/actors/image-actor.h>
 #include <dali/public-api/actors/layer.h>
 #include <dali/public-api/adaptor-framework/timer.h>
 #include <dali/public-api/animation/animation.h>
@@ -309,9 +308,9 @@ private:
   /**
    * @brief Create Dimmed Backing (covers all content behind the dialog).
    *
-   * @return The backing actor.
+   * @return The backing control.
    */
-  ImageActor CreateBacking();
+  Toolkit::Control CreateBacking();
 
   /**
    * @brief Creates the lower area within the popup.
@@ -433,13 +432,13 @@ private:
   /**
    * Called when the popup is directly or indirectly parented to the stage.
    */
-  virtual void OnControlStageConnection();
+  virtual void OnStageConnection( int depth );
 
   /**
    * From Control; called after a child has been added to the owning actor.
    * @param[in] child The child which has been added.
    */
-  virtual void OnControlChildAdd( Actor& child );
+  virtual void OnChildAdd( Actor& child );
 
   /**
    * @copydoc Control::OnRelayOut()
@@ -478,6 +477,25 @@ private:
 
 private:
 
+  /**
+   * Recursively add any focusable actors or layout containers to the provided vector.
+   * Include the top level actor if it is a layout container.
+   *
+   * @param[in]     parent          The actor to start from
+   * @param[in/out] focusableActors The vector to add focusable actors to
+   */
+  void AddFocusableChildren( Actor parent, std::vector< Actor >& focusableActors );
+
+  /**
+   * Recursively add any focusable actors or layout containers to the provided vector.
+   *
+   * @param[in]     parent          The actor to start from
+   * @param[in/out] focusableActors The vector to add focusable actors to
+   */
+  void AddFocusableChildrenRecursive( Actor parent, std::vector< Actor >& focusableActors );
+
+private:
+
   // Undefined.
   Popup(const Popup&);
 
@@ -494,7 +512,7 @@ private:
 
   Layer mLayer;                                      ///< Popup Layer (i.e. Dim backing and PopupBg reside in this).
   Toolkit::TableView mPopupLayout;                   ///< Popup Background (i.e. dialog reside in this).
-  ImageActor mBacking;                               ///< Backing actor (dim effect).
+  Toolkit::Control mBacking;                         ///< Backing actor (dim effect).
   Actor mPreviousFocusedActor;                       ///< Store the previous focused actor to restore the focus when popup hide.
   Actor mTailImage;                                  ///< Stores the tail image.
   Actor mPopupContainer;                             ///< This actor is used to house the background image and the main popup layout.