fix zoom view bug

1. App is terminated if key is pressed continually
2. Image content does not move before content has the focus.

Change-Id: I7121b57ff40894355b0ea527016d7cef9ece870a
Signed-off-by: Jehun Lim <jehun.lim@samsung.com>

diff --git a/src/util/timeout_handler.cpp b/src/util/timeout_handler.cpp
index 15f91fa..f0c4588 100644 (file)
--- a/src/util/timeout_handler.cpp
+++ b/src/util/timeout_handler.cpp
@@ -153,7 +153,7 @@ void CTimeoutHandler::Reset(void)
 {
        ASSERT(m);
 
-       sm_CbEvent(m, 0, NULL);
+       m_OnEvent(0, NULL);
 }
 
 

diff --git a/src/view/photo-viewer/zoom_view.cpp b/src/view/photo-viewer/zoom_view.cpp
index f5bcd58..a1f7905 100644 (file)
--- a/src/view/photo-viewer/zoom_view.cpp
+++ b/src/view/photo-viewer/zoom_view.cpp
@@ -427,8 +427,8 @@ void CPhotoZoomView::t_OnShow(void)
 
        evas_object_show(m->eoBase);
 
-       elm_object_focus_allow_set(m->eoBase, EINA_TRUE);
-       elm_object_focus_set(m->eoBase, EINA_TRUE);
+       elm_object_focus_allow_set(m->eoPhotocam, EINA_TRUE);
+       elm_object_focus_set(m->eoPhotocam, EINA_TRUE);
 
        t_OnResume();
 }