From 721e7be58cc036bae62526d8ac7181a259ad0e0e Mon Sep 17 00:00:00 2001 From: "bunam.jeon" Date: Fri, 23 Aug 2013 17:36:27 +0900 Subject: [PATCH] Apply z order to drag and auto fill [Title] Apply z order to drag and auto fill [Issue#] N/A [Problem] Unapplied z order [Cause] N/A [Solution] Apply z order Change-Id: I6982e95507482e4e83c244728b87eaf3cc9d3a45 --- Source/WebKit2/UIProcess/API/efl/tizen/AutoFillPopup.cpp | 2 ++ Source/WebKit2/UIProcess/API/efl/tizen/DragHandle.cpp | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/AutoFillPopup.cpp b/Source/WebKit2/UIProcess/API/efl/tizen/AutoFillPopup.cpp index a6bc07d..cd99229 100755 --- a/Source/WebKit2/UIProcess/API/efl/tizen/AutoFillPopup.cpp +++ b/Source/WebKit2/UIProcess/API/efl/tizen/AutoFillPopup.cpp @@ -83,6 +83,8 @@ AutoFillPopup::AutoFillPopup(Evas_Object* object, const String& theme, const Str if (!elm_layout_file_set(m_icon, theme.utf8().data(), path.utf8().data())) return; + evas_object_smart_member_add(m_icon, object); + m_list = elm_genlist_add(m_icon); } diff --git a/Source/WebKit2/UIProcess/API/efl/tizen/DragHandle.cpp b/Source/WebKit2/UIProcess/API/efl/tizen/DragHandle.cpp index 2c8cd19..90f4eef 100755 --- a/Source/WebKit2/UIProcess/API/efl/tizen/DragHandle.cpp +++ b/Source/WebKit2/UIProcess/API/efl/tizen/DragHandle.cpp @@ -52,7 +52,7 @@ DragHandle::DragHandle(Evas_Object* object, const String& theme, const String& p { Evas_Object* topWidget = elm_object_top_widget_get(elm_object_parent_widget_get(object)); if (!topWidget) - topWidget = object; + topWidget = m_view; m_icon = elm_layout_add(topWidget); m_cancelIcon = elm_layout_add(topWidget); @@ -63,6 +63,9 @@ DragHandle::DragHandle(Evas_Object* object, const String& theme, const String& p if (!elm_layout_file_set(m_icon, theme.utf8().data(), path.utf8().data()) || !elm_layout_file_set(m_cancelIcon, theme.utf8().data(), "drag_cancel")) return; + evas_object_smart_member_add(m_icon, m_view); + evas_object_smart_member_add(m_cancelIcon, m_view); + evas_object_propagate_events_set(m_icon, false); evas_object_event_callback_add(m_icon, EVAS_CALLBACK_MOUSE_DOWN, mouseDown, this); evas_object_event_callback_add(m_icon, EVAS_CALLBACK_MOUSE_MOVE, mouseMove, this); -- 2.7.4