1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNSView: Pass on the responder chain if deletion is pending

Browse Source 
Change-Id: I7d098b61f6feb2ac38582c0efb1bbdf25a83e967
Task-number: QTBUG-53398
Reviewed-by: René J.V. Bertin <rjvbertin@gmail.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
This commit is contained in:
Gabriel de Dietrich 2016-05-16 16:28:24 -07:00 committed by Jani Heikkinen
parent a1dccd0708
commit 9e3e987590
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/platforms/cocoa/qnsview.mm
View File

@ -653,7 +653,9 @@ QT_WARNING_POP
- (BOOL)becomeFirstResponder - (BOOL)becomeFirstResponder
{ {
if (m_window && (m_window->flags() & Qt::WindowTransparentForInput) ) if (!m_window || !m_platformWindow)
return NO;
if (m_window->flags() & Qt::WindowTransparentForInput)
return NO; return NO;
if (!m_platformWindow->windowIsPopupType() && !m_isMenuView) if (!m_platformWindow->windowIsPopupType() && !m_isMenuView)
QWindowSystemInterface::handleWindowActivated([self topLevelWindow]); QWindowSystemInterface::handleWindowActivated([self topLevelWindow]);
@ -662,11 +664,13 @@ QT_WARNING_POP
- (BOOL)acceptsFirstResponder - (BOOL)acceptsFirstResponder
{ {
if (!m_window || !m_platformWindow)
return NO;
if (m_isMenuView) if (m_isMenuView)
return NO; return NO;
if (m_platformWindow->shouldRefuseKeyWindowAndFirstResponder()) if (m_platformWindow->shouldRefuseKeyWindowAndFirstResponder())
return NO; return NO;
if (m_window && (m_window->flags() & Qt::WindowTransparentForInput) ) if (m_window->flags() & Qt::WindowTransparentForInput)
return NO; return NO;
if ((m_window->flags() & Qt::ToolTip) == Qt::ToolTip) if ((m_window->flags() & Qt::ToolTip) == Qt::ToolTip)
return NO; return NO;
@ -676,7 +680,9 @@ QT_WARNING_POP
- (BOOL)acceptsFirstMouse:(NSEvent *)theEvent - (BOOL)acceptsFirstMouse:(NSEvent *)theEvent
{ {
Q_UNUSED(theEvent) Q_UNUSED(theEvent)
if (m_window && (m_window->flags() & Qt::WindowTransparentForInput) ) if (!m_window || !m_platformWindow)
return NO;
if (m_window->flags() & Qt::WindowTransparentForInput)
return NO; return NO;
return YES; return YES;
} }