From 538f47cb77f2dcc34383859bd64de3667987f17b Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Sat, 9 Jul 2016 15:35:47 +0200 Subject: QQuickAbstractButton: make the press point available via private API The Material style ripple effect needs it to be able to anchor waves at the press point. Export QQuickAbstractButtonPrivate to make it accessible, and update the press point before emitting pressedChanged() since that's what the ripple effect reacts to. Press point dependent ripple effects follow in separate commits. Change-Id: I63eb51eeabcbeb307dea9d0b1731bdb51b518ec7 Reviewed-by: Mitch Curtis --- src/quicktemplates2/qquickabstractbutton.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quicktemplates2/qquickabstractbutton.cpp') diff --git a/src/quicktemplates2/qquickabstractbutton.cpp b/src/quicktemplates2/qquickabstractbutton.cpp index c4b2b6f0..ac5fbf55 100644 --- a/src/quicktemplates2/qquickabstractbutton.cpp +++ b/src/quicktemplates2/qquickabstractbutton.cpp @@ -474,8 +474,8 @@ void QQuickAbstractButton::keyPressEvent(QKeyEvent *event) Q_D(QQuickAbstractButton); QQuickControl::keyPressEvent(event); if (event->key() == Qt::Key_Space) { - setPressed(true); d->pressPoint = QPoint(qRound(width() / 2), qRound(height() / 2)); + setPressed(true); if (d->autoRepeat) { d->startRepeatDelay(); @@ -506,8 +506,8 @@ void QQuickAbstractButton::mousePressEvent(QMouseEvent *event) { Q_D(QQuickAbstractButton); QQuickControl::mousePressEvent(event); - setPressed(true); d->pressPoint = event->pos(); + setPressed(true); emit pressed(); -- cgit v1.2.3