Changeset 17957 in webkit

Timestamp:

Nov 30, 2006 6:16:39 PM (17 years ago)

Author:

zbujtas

Message:

2006-11-30 yadavall <​sriram.yadavalli@nokia.com>

Reviewed by Zalan Bujtas (​zbujtas@gmail.com).
DESC: Tabbed navigation fixes
​http://bugs.webkit.org/show_bug.cgi?id=11725

WARNING: NO TEST CASES ADDED OR CHANGED

• kwq/KWQKHTMLPart.cpp: (KWQKHTMLPart::getNewTabbedCursorPosition): (KWQKHTMLPart::tabbedNavigation):

Location:

S60/trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• kwq/KWQKHTMLPart.cpp (modified) (2 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+2006-11-30  yadavall  <sriram.yadavalli@nokia.com>
+
+        Reviewed by Zalan Bujtas (zbujtas@gmail.com).
+        DESC: Tabbed navigation fixes
+        http://bugs.webkit.org/show_bug.cgi?id=11725
+
+        WARNING: NO TEST CASES ADDED OR CHANGED
+
+        * kwq/KWQKHTMLPart.cpp:
+        (KWQKHTMLPart::getNewTabbedCursorPosition):
+        (KWQKHTMLPart::tabbedNavigation):
+
 2006-11-30  rathnasa  <sornalatha.rathnasamy@nokia.com>
 

S60/trunk/WebCore/kwq/KWQKHTMLPart.cpp

@@ -3814 +3814 @@
 
        //Resize the rect so that the cursor is comfortably inside the box
-       intersectRect.inflate(-2);
+       if(intersectRect.width()>2 && intersectRect.height()>2) {
+           intersectRect.inflate(-2);
+       }
 
        if(!intersectRect.isEmpty()){
@@ -4046 +4048 @@
        QRect viewRect(focusedFramePart->view()->contentsX(),focusedFramePart->view()->contentsY(),
        focusedFramePart->view()->visibleWidth(),focusedFramePart->view()->visibleHeight());
-       if(focusRect.intersects(viewRect)) {
-          focusedFramePart->view()->scrollTo(focusRect.intersect(viewRect));
-       }
-       else {
+       if(viewRect.unite(focusRect) != viewRect) {
           focusedFramePart->view()->scrollTo(focusRect);
        }