X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=Source%2FWebKit2%2FUIProcess%2Ftizen%2FWebContextMenuProxyTizen.cpp;h=2a475129dba92ab0cd59efa779f3153216998390;hb=c7a1301ce8c032ce5e42262f626c50339e13f84c;hp=6e66b2bd8c87abad57480a9e6c8bc011b386fa8f;hpb=8b1930512c6400a038d38d4f13c3c7d0669901f5;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/Source/WebKit2/UIProcess/tizen/WebContextMenuProxyTizen.cpp b/Source/WebKit2/UIProcess/tizen/WebContextMenuProxyTizen.cpp
index 6e66b2b..2a47512 100755
--- a/Source/WebKit2/UIProcess/tizen/WebContextMenuProxyTizen.cpp
+++ b/Source/WebKit2/UIProcess/tizen/WebContextMenuProxyTizen.cpp
@@ -82,6 +82,10 @@ void WebContextMenuProxyTizen::contextMenuItemSelectedCallback(void* data, Evas_
     menuProxy->m_pageClientImpl->hideFocusRing();
 #endif
 
+#if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION)
+    menuProxy->m_pageClientImpl->initTextSelectionHandlesMouseDownedStatus();
+#endif
+
     menuProxy->m_page->contextMenuItemSelected(itemData);
     menuProxy->hideContextMenu();
 
@@ -123,8 +127,8 @@ void WebContextMenuProxyTizen::createEflMenu(const Vector<WebContextMenuItemData
             if (!m_items.at(i).iconFile().isEmpty()) {
                 icon = elm_icon_add(m_popup);
                 TIZEN_LOGI("icon file path : %s", m_items.at(i).iconFile().utf8().data());
-                if (!elm_icon_file_set(icon, m_items.at(i).iconFile().utf8().data(), NULL)) {
-                    TIZEN_LOGE("elm_icon_file_set is failed");
+                if (!elm_image_file_set(icon, m_items.at(i).iconFile().utf8().data(), NULL)) {
+                    TIZEN_LOGE("elm_image_file_set is failed");
                     icon = 0;
                 }
             }
@@ -181,15 +185,20 @@ void WebContextMenuProxyTizen::showContextMenu(const WebCore::IntPoint& position
             popupPosition.move(-scrollPosition.x(), -scrollPosition.y());
         }
 #endif
+        popupPosition.setX(popupPosition.x() + webViewX);
+        popupPosition.setY(popupPosition.y() + webViewY);
 
 #if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION)
-        if ( m_pageClientImpl->isTextSelectionMode()) {
+        if (m_pageClientImpl->isTextSelectionMode()) {
+            elm_object_style_set(m_popup,"copypaste");
             elm_ctxpopup_horizontal_set(m_popup, EINA_TRUE);
             elm_ctxpopup_direction_priority_set(m_popup, ELM_CTXPOPUP_DIRECTION_UP, ELM_CTXPOPUP_DIRECTION_UP, ELM_CTXPOPUP_DIRECTION_UP, ELM_CTXPOPUP_DIRECTION_UP);
+
+            m_pageClientImpl->changeContextMenuPosition(popupPosition);
         }
 #endif
 
-        evas_object_move(m_popup, popupPosition.x() + webViewX, popupPosition.y() + webViewY);
+        evas_object_move(m_popup, popupPosition.x(), popupPosition.y());
         evas_object_show(m_popup);
 
         evas_object_smart_callback_add(m_popup, "dismissed", contextMenuPopupDismissedCallback, m_pageClientImpl);
@@ -197,7 +206,7 @@ void WebContextMenuProxyTizen::showContextMenu(const WebCore::IntPoint& position
         m_pageClientImpl->setIsContextMenuVisible(true);
 #if ENABLE(TOUCH_EVENTS) && ENABLE(TIZEN_GESTURE)
         // Cancel touch event when ContextMenu is shown.
-        EwkViewImpl::fromEvasObject(m_webView)->feedCancelTouchEvents();
+        EwkViewImpl::fromEvasObject(m_webView)->feedTouchEventsByType(EWK_TOUCH_CANCEL);
 #endif
     }
 #else