Changeset 112105 in webkit


Ignore:
Timestamp:
Mar 26, 2012 8:50:09 AM (12 years ago)
Author:
commit-queue@webkit.org
Message:

[Qt WK2] Disable/enable mouse events when displaying dialogs only for desktop view
​https://bugs.webkit.org/show_bug.cgi?id=80542

Patch by Dinu Jacob <​dinu.jacob@nokia.com> on 2012-03-26
Reviewed by Simon Hausmann.

  • UIProcess/API/qt/qquickwebview.cpp:

(QQuickWebViewLegacyPrivate::enableMouseEvents):
(QQuickWebViewLegacyPrivate::disableMouseEvents):

  • UIProcess/API/qt/qquickwebview_p_p.h:

(QQuickWebViewPrivate::enableMouseEvents):
(QQuickWebViewPrivate::disableMouseEvents):
(QQuickWebViewLegacyPrivate):

Location:
trunk/Source/WebKit2
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r112096 r112105  
     12012-03-26  Dinu Jacob  <dinu.jacob@nokia.com>
     2
     3        [Qt WK2] Disable/enable mouse events when displaying dialogs only for desktop view
     4        https://bugs.webkit.org/show_bug.cgi?id=80542
     5
     6        Reviewed by Simon Hausmann.
     7       
     8        * UIProcess/API/qt/qquickwebview.cpp:
     9        (QQuickWebViewLegacyPrivate::enableMouseEvents):
     10        (QQuickWebViewLegacyPrivate::disableMouseEvents):
     11        * UIProcess/API/qt/qquickwebview_p_p.h:
     12        (QQuickWebViewPrivate::enableMouseEvents):
     13        (QQuickWebViewPrivate::disableMouseEvents):
     14        (QQuickWebViewLegacyPrivate):
     15
    1162012-03-26  Jocelyn Turcotte  <jocelyn.turcotte@nokia.com>
    217

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

    r111738 r112105  
    138138}
    139139
    140 void QQuickWebViewPrivate::enableMouseEvents()
    141 {
    142     Q_Q(QQuickWebView);
    143     q->setAcceptedMouseButtons(Qt::MouseButtonMask);
    144     q->setAcceptHoverEvents(true);
    145 }
    146 
    147 void QQuickWebViewPrivate::disableMouseEvents()
    148 {
    149     Q_Q(QQuickWebView);
    150     q->setAcceptedMouseButtons(Qt::NoButton);
    151     q->setAcceptHoverEvents(false);
    152 }
    153 
    154140QPointF QQuickWebViewPrivate::pageItemPos()
    155141{
    … …  
    503489    webPageProxy->drawingArea()->setSize(viewportSize, IntSize());
    504490    webPageProxy->drawingArea()->setVisibleContentsRect(IntRect(IntPoint(), viewportSize), 1, FloatPoint());
     491}
     492
     493void QQuickWebViewLegacyPrivate::enableMouseEvents()
     494{
     495    Q_Q(QQuickWebView);
     496    q->setAcceptedMouseButtons(Qt::MouseButtonMask);
     497    q->setAcceptHoverEvents(true);
     498}
     499
     500void QQuickWebViewLegacyPrivate::disableMouseEvents()
     501{
     502    Q_Q(QQuickWebView);
     503    q->setAcceptedMouseButtons(Qt::NoButton);
     504    q->setAcceptHoverEvents(false);
    505505}
    506506

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

    r111721 r112105  
    6767    virtual void initialize(WKContextRef contextRef = 0, WKPageGroupRef pageGroupRef = 0);
    6868
    69     void enableMouseEvents();
    70     void disableMouseEvents();
     69    virtual void enableMouseEvents() { }
     70    virtual void disableMouseEvents() { }
    7171
    7272    virtual QPointF pageItemPos();
    … …  
    179179
    180180    virtual void updateViewportSize();
     181    virtual void enableMouseEvents();
     182    virtual void disableMouseEvents();
    181183};
    182184
Note: See TracChangeset for help on using the changeset viewer.