Changeset 102674 in webkit


Ignore:
Timestamp:
Dec 13, 2011, 5:28:32 AM (14 years ago)
Author:
kenneth@webkit.org
Message:

[Qt] Make sure that touch events result in the page view gaining focus

Reviewed by Simon Hausmann.

  • UIProcess/API/qt/qquickwebpage.cpp:

(QQuickWebPage::touchEvent): Force active focus.

  • UIProcess/API/qt/qquickwebview.cpp:
  • UIProcess/API/qt/qquickwebview_p.h: Remove ::touchEvent override.
Location:
trunk/Source/WebKit2
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r102673 r102674  
     12011-12-13  Kenneth Rohde Christiansen  <kenneth@webkit.org>
     2
     3        [Qt] Make sure that touch events result in the page view gaining focus
     4
     5        Reviewed by Simon Hausmann.
     6
     7        * UIProcess/API/qt/qquickwebpage.cpp:
     8        (QQuickWebPage::touchEvent): Force active focus.
     9        * UIProcess/API/qt/qquickwebview.cpp:
     10        * UIProcess/API/qt/qquickwebview_p.h: Remove ::touchEvent override.
     11
    1122011-12-13  Carlos Garcia Campos  <cgarcia@igalia.com>
    213

  • trunk/Source/WebKit2/UIProcess/API/qt/qquickwebpage.cpp

    r102445 r102674  
    157157void QQuickWebPage::touchEvent(QTouchEvent* event)
    158158{
     159    forceActiveFocus();
    159160    this->event(event);
    160161}

  • trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp

    r102670 r102674  
    707707}
    708708
    709 void QQuickWebView::touchEvent(QTouchEvent* event)
    710 {
    711     forceActiveFocus();
    712     QQuickItem::touchEvent(event);
    713 }
    714 
    715709WKPageRef QQuickWebView::pageRef() const
    716710{

  • trunk/Source/WebKit2/UIProcess/API/qt/qquickwebview_p.h

    r102583 r102674  
    121121    virtual void focusInEvent(QFocusEvent*);
    122122    virtual void focusOutEvent(QFocusEvent*);
    123     virtual void touchEvent(QTouchEvent* event);
    124123
    125124private:
Note: See TracChangeset for help on using the changeset viewer.