Do not adjust focused input node if node is visible now.

[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 5fb8017..efd814c 100755 (executable)
--- a/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
+++ b/Source/WebKit2/UIProcess/API/efl/ewk_view.cpp
@@ -315,7 +315,8 @@ static Eina_Bool _ewk_view_smart_focus_out(Ewk_View_Smart_Data* smartData)
 #endif
 
 #if ENABLE(TIZEN_WEBKIT2_CONTEXT_MENU_CLIPBOARD)
-    impl->pageClient->clearClipboardSelectionHandler();
+    if (impl->pageClient->isClipboardWindowOpened())
+        impl->pageClient->closeClipboardWindow();
 #endif
 
 #if ENABLE(TIZEN_DRAG_SUPPORT)
@@ -530,11 +531,11 @@ static Eina_Bool _ewk_view_smart_gesture_end(Ewk_View_Smart_Data* smartData, con
         if (impl->pageClient->isDragMode())
             impl->pageClient->setDragMode(false);
 #endif
-            impl->gestureClient->endTap(IntPoint(event->position.x, event->position.y));
 #if ENABLE(TIZEN_WEBKIT2_TEXT_SELECTION)
             if (impl->pageClient->isTextSelectionMode())
                 impl->pageClient->setIsTextSelectionMode(false);
 #endif
+            impl->gestureClient->endTap(IntPoint(event->position.x, event->position.y));
 #if ENABLE(TIZEN_ISF_PORT)
             evas_object_focus_set(smartData->self, true);
 #endif
@@ -1635,7 +1636,7 @@ void ewk_view_form_password_data_fill(Evas_Object* ewkView)
     for (size_t i = 0; i < passwordFormData.size(); i++) {
         passwordFormAutofill += String::format(" inputFields = document.getElementsByName(\"%s\");"
             " for (var i = 0; i < inputFields.length; i++)"
-            " if (inputFields[i].tagName.toLowerCase() == \"input\" && (inputFields[i].type.toLowerCase() == \"text\" || inputFields[i].type.toLowerCase() == \"password\"))"
+            " if (inputFields[i].tagName.toLowerCase() == \"input\" && (inputFields[i].type.toLowerCase() == \"text\" || inputFields[i].type.toLowerCase() == \"password\" || inputFields[i].type.toLowerCase() == \"email\"))"
             " inputFields[i].value = \"%s\";",
             passwordFormData[i].first.utf8().data(), passwordFormData[i].second.utf8().data());
     }
@@ -2461,7 +2462,6 @@ bool ewk_view_focused_node_adjust(Evas_Object* ewkView, Eina_Bool adjustForExter
         return false;
 #endif
 
-    IntSize visibleSize(smartData->view.w, smartData->view.h);
     // caret position can be outside of visible rect.
     // we need to consider it.
     IntRect selectionRect = impl->pageProxy->getSelectionRect(true);
@@ -2476,13 +2476,17 @@ bool ewk_view_focused_node_adjust(Evas_Object* ewkView, Eina_Bool adjustForExter
     if (selectionRect.isEmpty())
         return false;
 
-    // set paddings
-    IntPoint scrollPosition(selectionRect.x() - visibleSize.width() / 3, selectionRect.y() - visibleSize.height() / 3);
-    // If both input field's position x and selection rect can be displayed together,
-    // adjust scroll position to input field's position x.
-    if (!focusedNodeRect.isEmpty()
-        && selectionRect.x() - focusedNodeRect.x() < visibleSize.width() * 4 / 5)
-        scrollPosition.setX(focusedNodeRect.x());
+    IntRect visibleRect = impl->pageClient->visibleContentRect();
+    IntPoint scrollPosition = visibleRect.location();
+    // Do not adjust scroll position if selection rect (caret) is visible after scaling.
+    if (!visibleRect.contains(selectionRect)) {
+        // set paddings
+        scrollPosition = IntPoint(selectionRect.x() - visibleRect.width() / 3, selectionRect.y() - visibleRect.height() / 3);
+        // If both input field's position x and selection rect can be displayed together,
+        // adjust scroll position to input field's position x.
+        if (!focusedNodeRect.isEmpty() && selectionRect.x() - focusedNodeRect.x() < visibleRect.width() * 4 / 5)
+            scrollPosition.setX(focusedNodeRect.x());
+    }
 
 #if ENABLE(TIZEN_WEBKIT2_TILED_BACKING_STORE)
     impl->pageClient->setVisibleContentRect(IntRect(scrollPosition, impl->size()), newScaleFactor);