projects
/
framework
/
web
/
webkit-efl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Do not hide context menu if it showing from image in editable content.
[framework/web/webkit-efl.git]
/
Source
/
WebKit2
/
UIProcess
/
API
/
efl
/
ewk_view.cpp
diff --git
a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
index
5898418
..
c05808b
100755
(executable)
--- a/
Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
+++ b/
Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
@@
-447,7
+447,7
@@
static Eina_Bool _ewk_view_smart_gesture_start(Ewk_View_Smart_Data* smartData, c
break;
#if ENABLE(TIZEN_DRAG_SUPPORT)
// 1. Check to start dragging.
break;
#if ENABLE(TIZEN_DRAG_SUPPORT)
// 1. Check to start dragging.
- if (hitTestResultData.isDragSupport) {
+ if (hitTestResultData.isDragSupport
&& !hitTestResultData.isContentEditable
) {
impl->pageClient->setDragPoint(scenePoint);
if (impl->pageClient->isDragMode()) {
impl->pageClient->setDragMode(false);
impl->pageClient->setDragPoint(scenePoint);
if (impl->pageClient->isDragMode()) {
impl->pageClient->setDragMode(false);
@@
-461,8
+461,8
@@
static Eina_Bool _ewk_view_smart_gesture_start(Ewk_View_Smart_Data* smartData, c
}
#endif
// 2. Check to show context menu.
}
#endif
// 2. Check to show context menu.
- if (
!hitTestResultData.absoluteImageURL.isEmpty(
)
-
|| !hitTestResultData.absoluteLinkURL.isEmpty()
) {
+ if (
(!hitTestResultData.absoluteImageURL.isEmpty() || !hitTestResultData.absoluteLinkURL.isEmpty()
)
+
&& !hitTestResultData.isContentEditable
) {
#if ENABLE(TIZEN_WEBKIT2_FOCUS_RING)
if (impl->focusRing)
impl->focusRing->show(IntRect(), true);
#if ENABLE(TIZEN_WEBKIT2_FOCUS_RING)
if (impl->focusRing)
impl->focusRing->show(IntRect(), true);
@@
-524,7
+524,7
@@
static Eina_Bool _ewk_view_smart_gesture_end(Ewk_View_Smart_Data* smartData, con
#if ENABLE(TIZEN_WEBKIT2_FOCUS_RING)
if (impl->focusRing) {
#if ENABLE(TIZEN_CONTEXT_MENU_WEBKIT_2)
#if ENABLE(TIZEN_WEBKIT2_FOCUS_RING)
if (impl->focusRing) {
#if ENABLE(TIZEN_CONTEXT_MENU_WEBKIT_2)
- if (!impl->pageClient->isContextMenuVisible())
+ if (!impl->pageClient->isContextMenuVisible()
|| impl->pageClient->isTextSelectionMode()
)
#endif
impl->focusRing->hide();
}
#endif
impl->focusRing->hide();
}