Merge "(Scripting) Added a simple gallery" into tizen

diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp
index 4014b55..f61d458 100644 (file)
--- a/demo/dali-table-view.cpp
+++ b/demo/dali-table-view.cpp
@@ -550,6 +550,7 @@ Actor DaliTableView::CreateTile( const string& name, const string& title, const
 
   // connect to the touch events
   tile.TouchedSignal().Connect( this, &DaliTableView::OnTilePressed );
+  tile.HoveredSignal().Connect( this, &DaliTableView::OnTileHovered );
 
   return tile;
 }
@@ -1041,3 +1042,11 @@ void DaliTableView::OnFocusedActorActivated( Dali::Actor activatedActor )
     OnTilePressed(mPressedActor, touchEventUp);
   }
 }
+
+bool DaliTableView::OnTileHovered( Actor actor, const HoverEvent& event )
+{
+  KeyboardFocusManager::Get().SetCurrentFocusActor( actor );
+  return true;
+}
+
+

diff --git a/demo/dali-table-view.h b/demo/dali-table-view.h
index 08746ea..5a0d37f 100644 (file)
--- a/demo/dali-table-view.h
+++ b/demo/dali-table-view.h
@@ -185,6 +185,16 @@ private: // Application callbacks & implementation
   bool OnTilePressed( Dali::Actor actor, const Dali::TouchEvent& event );
 
   /**
+   * Signal emitted when any tile has been hovered
+   *
+   * @param[in] actor The Actor representing this tile.
+   * @param[in] event The HoverEvent
+   *
+   * @return Consume flag
+   */
+  bool OnTileHovered( Dali::Actor actor, const Dali::HoverEvent& event );
+
+  /**
    * Signal emitted when the pressed animation has completed.
    *
    * @param[in] source The animation source.