Slightly improved mouse processing for gift buttons.

Author: 23rd

Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.cpp

@@ -538,36 +538,45 @@ void GiftButton::contextMenuEvent(QContextMenuEvent *e) {
 }
 
 void GiftButton::mousePressEvent(QMouseEvent *e) {
-	if (e->button() != Qt::LeftButton) {
-		return;
-	}
-	_mouseEvents.fire_copy(e);
-	if (e->isAccepted()) {
-		return;
+	if (_mouseEventsAreListening) {
+		if (e->button() != Qt::LeftButton) {
+			return;
+		}
+		_mouseEvents.fire_copy(e);
+	} else {
+		AbstractButton::mousePressEvent(e);
 	}
-	AbstractButton::mousePressEvent(e);
 }
 
 void GiftButton::mouseMoveEvent(QMouseEvent *e) {
-	if (e->button() != Qt::LeftButton) {
-		return;
-	}
-	_mouseEvents.fire_copy(e);
-	if (e->isAccepted()) {
-		return;
+	if (_mouseEventsAreListening) {
+		if (e->button() != Qt::LeftButton) {
+			return;
+		}
+		_mouseEvents.fire_copy(e);
+	} else {
+		AbstractButton::mouseMoveEvent(e);
 	}
-	AbstractButton::mouseMoveEvent(e);
 }
 
 void GiftButton::mouseReleaseEvent(QMouseEvent *e) {
-	if (e->button() != Qt::LeftButton) {
-		return;
-	}
-	_mouseEvents.fire_copy(e);
-	if (e->isAccepted()) {
-		return;
+	if (_mouseEventsAreListening) {
+		if (e->button() != Qt::LeftButton) {
+			return;
+		}
+		_mouseEvents.fire_copy(e);
+	} else {
+		AbstractButton::mouseReleaseEvent(e);
 	}
-	AbstractButton::mouseReleaseEvent(e);
+}
+
+rpl::producer<QPoint> GiftButton::contextMenuRequests() const {
+	return _contextMenuRequests.events();
+}
+
+rpl::producer<QMouseEvent*> GiftButton::mouseEvents() {
+	_mouseEventsAreListening = true;
+	return _mouseEvents.events();
 }
 
 void GiftButton::cacheUniqueBackground(

Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_common.h

@@ -174,13 +174,8 @@ class GiftButton final : public Ui::AbstractButton {
 		GiftSelectionMode selectionMode = GiftSelectionMode::Border,
 		anim::type animated = anim::type::normal);
 
-	[[nodiscard]] rpl::producer<QPoint> contextMenuRequests() const {
-		return _contextMenuRequests.events();
-	}
-
-	[[nodiscard]] rpl::producer<QMouseEvent*> mouseEvents() const {
-		return _mouseEvents.events();
-	}
+	[[nodiscard]] rpl::producer<QPoint> contextMenuRequests() const;
+	[[nodiscard]] rpl::producer<QMouseEvent*> mouseEvents();
 
 private:
 	void paintEvent(QPaintEvent *e) override;
@@ -228,6 +223,8 @@ class GiftButton final : public Ui::AbstractButton {
 	bool _selected : 1 = false;
 	bool _locked : 1 = false;
 
+	bool _mouseEventsAreListening = false;
+
 	base::Timer _lockedTimer;
 	TimeId _lockedUntilDate = 0;
 

Telegram/SourceFiles/info/peer_gifts/info_peer_gifts_widget.cpp

@@ -747,21 +747,12 @@ std::unique_ptr<GiftButton> InnerWidget::createGiftButton() {
 		case QEvent::MouseButtonPress:
 			raw->raise();
 			mousePressEvent(e);
-			if (e->isAccepted()) {
-				return;
-			}
 			break;
 		case QEvent::MouseMove:
 			mouseMoveEvent(e);
-			if (e->isAccepted()) {
-				return;
-			}
 			break;
 		case QEvent::MouseButtonRelease:
 			mouseReleaseEvent(e);
-			if (e->isAccepted()) {
-				return;
-			}
 			break;
 		default:
 			break;