From f942d82d143a69c34ac769cf201690941d8db648 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Wed, 13 Apr 2016 12:58:54 +0200 Subject: Cocoa integration - invert 'masked out event' logic MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit If a mask region contains a point - the event is _not_ masked out. Task-number: QTBUG-52533 Change-Id: I56d0276f5e3853479c2687addb95c2600edd3cda Reviewed-by: Shawn Rutledge Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/cocoa/qnsview.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index a2e3b9a949..12629700ec 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -844,7 +844,7 @@ QT_WARNING_POP Q_UNUSED(qtScreenPoint); // Maintain masked state for the button for use by MouseDragged and MouseUp. - const bool masked = m_maskRegion.contains(qtWindowPoint.toPoint()); + const bool masked = [self hasMask] && !m_maskRegion.contains(qtWindowPoint.toPoint()); if (masked) m_acceptedMouseDowns &= ~button; else @@ -950,7 +950,7 @@ QT_WARNING_POP [self convertFromScreen:[self screenMousePoint:theEvent] toWindowPoint:&qtWindowPoint andScreenPoint:&qtScreenPoint]; Q_UNUSED(qtScreenPoint); - bool masked = m_maskRegion.contains(qtWindowPoint.toPoint()); + const bool masked = [self hasMask] && !m_maskRegion.contains(qtWindowPoint.toPoint()); // Maintain masked state for the button for use by MouseDragged and Up. if (masked) -- cgit v1.2.3