From 85357472d029405a0962eb90feab2baf865b5aec Mon Sep 17 00:00:00 2001 From: Christian Ehrlicher Date: Sat, 28 Jul 2018 14:29:36 +0200 Subject: QToolTip::mouseMoveEvent(): always call base class QLabel::mouseMoveEvent() only called the base class implementation when a rect was given to showText which could lead to inconsistent behavior. Change-Id: I3e537ba5ae7c3c67715975624d1ee9f0c04fa9a7 Reviewed-by: Samuel Gaist Reviewed-by: Friedemann Kleint --- src/widgets/kernel/qtooltip.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp index f70efff9a1..8c5573d3a3 100644 --- a/src/widgets/kernel/qtooltip.cpp +++ b/src/widgets/kernel/qtooltip.cpp @@ -264,13 +264,13 @@ void QTipLabel::resizeEvent(QResizeEvent *e) void QTipLabel::mouseMoveEvent(QMouseEvent *e) { - if (rect.isNull()) - return; - QPoint pos = e->globalPos(); - if (widget) - pos = widget->mapFromGlobal(pos); - if (!rect.contains(pos)) - hideTip(); + if (!rect.isNull()) { + QPoint pos = e->globalPos(); + if (widget) + pos = widget->mapFromGlobal(pos); + if (!rect.contains(pos)) + hideTip(); + } QLabel::mouseMoveEvent(e); } -- cgit v1.2.3