Example of usage of ModelView class

[platform/core/uifw/dali-demo.git] / demo / dali-table-view.h

diff --git a/demo/dali-table-view.h b/demo/dali-table-view.h
index 163b52d..8b1353d 100644 (file)
--- a/demo/dali-table-view.h
+++ b/demo/dali-table-view.h
@@ -22,6 +22,7 @@
 
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/popup/popup.h>
 
 class Example;
 
@@ -317,7 +318,7 @@ private: // Application callbacks & implementation
    *
    * @return The created image actor
    */
-  Dali::ImageActor CreateLogo( std::string imagePath );
+  Dali::Toolkit::ImageView CreateLogo( std::string imagePath );
 
   /**
    * Timer handler for ending background animation
@@ -344,7 +345,7 @@ private: // Application callbacks & implementation
    * @param[in] direction The direction to move the focus
    * @return The actor to move the keyboard focus to.
    */
-  Dali::Actor OnKeyboardPreFocusChange( Dali::Actor current, Dali::Actor proposed, Dali::Toolkit::Control::KeyboardFocusNavigationDirection direction );
+  Dali::Actor OnKeyboardPreFocusChange( Dali::Actor current, Dali::Actor proposed, Dali::Toolkit::Control::KeyboardFocus::Direction direction );
 
   /**
    * Callback when the keyboard focused actor is activated.
@@ -366,11 +367,6 @@ private: // Application callbacks & implementation
    */
   void HideVersionPopup();
 
-  /**
-   * Called when the popup is completely hidden
-   */
-  void PopupHidden();
-
  /*
   * @brief Callback called when the buttons page actor is relaid out
   *
@@ -391,7 +387,6 @@ private:
   Dali::Layer                     mBackgroundLayer;          ///< Background resides on a separate layer.
   Dali::Toolkit::TableView        mRootActor;                ///< All content (excluding background is anchored to this Actor)
   Dali::Animation                 mRotateAnimation;          ///< Animation to rotate and resize mRootActor.
-  Dali::ImageActor                mBackground;               ///< Background's static image.
   Dali::Animation                 mPressedAnimation;         ///< Button press scaling animation.
   Dali::Layer                     mScrollViewLayer;          ///< ScrollView resides on a separate layer.
   Dali::Toolkit::ScrollView       mScrollView;               ///< ScrollView container (for all Examples)
@@ -418,7 +413,6 @@ private:
   bool                            mScrolling:1;              ///< Flag indicating whether view is currently being scrolled
   bool                            mSortAlphabetically:1;     ///< Sort examples alphabetically.
   bool                            mBackgroundAnimsPlaying:1; ///< Are background animations playing
-  bool                            mVersionPopupShown:1;      ///< Whehter the version popup is shown or not
 
 };