amass/qt-build-tools
1
0
Fork 0
mirror of https://github.com/crystalidea/qt-build-tools.git synced 2024-11-26 12:37:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

5.6.1 from final version of 5.6.1

Browse Source
This commit is contained in:
kleuter 2016-06-08 20:07:18 +02:00
parent 75f80f8bb5
commit f7f9e22235
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
5.6.1/qtbase/src/plugins/platforms/cocoa/qcocoawindow.mm
View File

@ -1135,8 +1135,7 @@ bool QCocoaWindow::setKeyboardGrabEnabled(bool grab)
if (grab && ![m_nsWindow isKeyWindow]) if (grab && ![m_nsWindow isKeyWindow])
[m_nsWindow makeKeyWindow]; [m_nsWindow makeKeyWindow];
else if (!grab && [m_nsWindow isKeyWindow])
[m_nsWindow resignKeyWindow];
return true; return true;
} }
@ -1147,8 +1146,7 @@ bool QCocoaWindow::setMouseGrabEnabled(bool grab)
if (grab && ![m_nsWindow isKeyWindow]) if (grab && ![m_nsWindow isKeyWindow])
[m_nsWindow makeKeyWindow]; [m_nsWindow makeKeyWindow];
else if (!grab && [m_nsWindow isKeyWindow])
[m_nsWindow resignKeyWindow];
return true; return true;
} }

12
5.6.1/qtbase/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;
} }