equal
deleted
inserted
replaced
79 return; |
79 return; |
80 } |
80 } |
81 |
81 |
82 TRect vr(visibleRect()); |
82 TRect vr(visibleRect()); |
83 TRect rect(r); |
83 TRect rect(r); |
84 if (isScaled() || m_frame->isFrameSet()) |
84 |
85 rect.Grow(1,1); // eliminate rounding errors |
|
86 TRect frameRect(m_frameRect); |
85 TRect frameRect(m_frameRect); |
87 |
86 |
88 rect.Move(-frameRect.iTl); |
87 rect.Move(-frameRect.iTl); |
89 rect.Move(m_contentPos); |
88 rect.Move(m_contentPos); |
90 if (vr.Intersects(rect)) { |
89 if (vr.Intersects(rect)) { |
107 clip.Intersection(t); |
106 clip.Intersection(t); |
108 } |
107 } |
109 |
108 |
110 gc.setClippingRect( clip ); |
109 gc.setClippingRect( clip ); |
111 |
110 |
|
111 //Converting To Doc and View co-ordinates calculation will loose 1 px |
|
112 //if the scalling is other than default level |
|
113 if (isScaled() || m_frame->isFrameSet()) |
|
114 rect.Grow(2,2); // eliminate rounding errors |
112 // draw frame content |
115 // draw frame content |
113 m_frame->paintRect(gc, rect); |
116 m_frame->paintRect(gc, rect); |
114 gc.cancelClipping(); |
117 gc.cancelClipping(); |
115 gc.setOrigin( gc.origin() + cpos); |
118 gc.setOrigin( gc.origin() + cpos); |
116 if (m_parent) { |
119 if (m_parent) { |
285 return TRect(m_contentPos, s ); |
288 return TRect(m_contentPos, s ); |
286 } |
289 } |
287 |
290 |
288 void WebFrameView::scrollTo(const TPoint& aPoint) |
291 void WebFrameView::scrollTo(const TPoint& aPoint) |
289 { |
292 { |
|
293 |
|
294 m_topView->scrollStatus(ETrue); |
|
295 |
290 if (m_parent) { |
296 if (m_parent) { |
291 // tot:fixme frame scrolling when frame-flat is off |
297 // tot:fixme frame scrolling when frame-flat is off |
292 if (m_frame->isIframe()) { |
298 if (m_frame->isIframe()) { |
293 // iframe, support scrolling |
299 // iframe, support scrolling |
294 if (aPoint != m_contentPos) { |
300 if (aPoint != m_contentPos) { |
436 focusedFrame = mainFrame; |
442 focusedFrame = mainFrame; |
437 } |
443 } |
438 Node* node = focusedFrame->document()->focusedNode(); |
444 Node* node = focusedFrame->document()->focusedNode(); |
439 if (node) { |
445 if (node) { |
440 TRect rect = node->getRect().Rect(); |
446 TRect rect = node->getRect().Rect(); |
441 TPoint viewpoint = kit(focusedFrame)->frameView()->frameCoordsInViewCoords(rect.iTl); |
447 TPoint viewPoint = kit(focusedFrame)->frameView()->frameCoordsInViewCoords(rect.iTl); |
442 WebCursor* cursor = StaticObjectsContainer::instance()->webCursor(); |
448 WebCursor* cursor = StaticObjectsContainer::instance()->webCursor(); |
443 cursor->updatePositionAndElemType(viewpoint); |
449 cursor->setPosition(viewPoint); |
444 } |
450 } |
445 } |
451 } |
446 } |
452 } |
447 |
453 |
448 void WebFrameView::setMayUseCopyScroll(TBool aCopy) |
454 void WebFrameView::setMayUseCopyScroll(TBool aCopy) |