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

5.6.2 apply patch for https://bugreports.qt.io/browse/QTBUG-52023

Browse Source
This commit is contained in:
kleuter 2016-10-14 13:05:04 +02:00
parent 94a0f0e575
commit c532ed1d65
3 changed files with 30 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
5.6.2/qtbase/src/plugins/platforms/cocoa/qcocoawindow.mm
View File

@ -1660,8 +1660,12 @@ void QCocoaWindow::setWindowCursor(NSCursor *cursor)
// Othervise, set the cursor if this window is under the mouse. In // Othervise, set the cursor if this window is under the mouse. In
// this case QNSView::cursorUpdate will set the cursor as the pointer // this case QNSView::cursorUpdate will set the cursor as the pointer
// moves. // moves.
if (m_nsWindow && m_qtView) { NSWindow *nsWindow = m_nsWindow;
[m_nsWindow invalidateCursorRectsForView : m_qtView]; if (!nsWindow)
nsWindow = [m_qtView nsWindow];
if (nsWindow && m_qtView) {
[nsWindow invalidateCursorRectsForView : m_qtView];
} else { } else {
if (m_windowUnderMouse) if (m_windowUnderMouse)
[cursor set]; [cursor set];

2
5.6.2/qtbase/src/plugins/platforms/cocoa/qnsview.h
View File

@ -140,6 +140,8 @@ Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QNSViewMouseMoveHelper));
- (void)registerDragTypes; - (void)registerDragTypes;
- (NSDragOperation)handleDrag:(id <NSDraggingInfo>)sender; - (NSDragOperation)handleDrag:(id <NSDraggingInfo>)sender;
- (NSWindow *)nsWindow;
@end @end
QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSView); QT_NAMESPACE_ALIAS_OBJC_CLASS(QNSView);

24
5.6.2/qtbase/src/plugins/platforms/cocoa/qnsview.mm
View File

@ -938,7 +938,7 @@ QT_WARNING_POP
{ {
Q_UNUSED(theEvent) Q_UNUSED(theEvent)
// Set the cursor manually if there is no NSWindow. // Set the cursor manually if there is no NSWindow.
if (!m_platformWindow->m_nsWindow && m_platformWindow->m_windowCursor) if (![self nsWindow] && m_platformWindow->m_windowCursor)
[m_platformWindow->m_windowCursor set]; [m_platformWindow->m_windowCursor set];
else else
[super cursorUpdate:theEvent]; [super cursorUpdate:theEvent];
@ -947,7 +947,7 @@ QT_WARNING_POP
-(void)resetCursorRects -(void)resetCursorRects
{ {
// Use the cursor rect API if there is a NSWindow // Use the cursor rect API if there is a NSWindow
if (m_platformWindow->m_nsWindow && m_platformWindow->m_windowCursor) if ([self nsWindow] && m_platformWindow->m_windowCursor)
[self addCursorRect:[self visibleRect] cursor:m_platformWindow->m_windowCursor]; [self addCursorRect:[self visibleRect] cursor:m_platformWindow->m_windowCursor];
} }
@ -2114,4 +2114,24 @@ static QPoint mapWindowCoordinates(QWindow *source, QWindow *target, QPoint poin
QWindowSystemInterface::handleMouseEvent(target, mapWindowCoordinates(m_window, target, qtWindowPoint), qtScreenPoint, m_buttons); QWindowSystemInterface::handleMouseEvent(target, mapWindowCoordinates(m_window, target, qtWindowPoint), qtScreenPoint, m_buttons);
} }
- (NSWindow *)nsWindow
{
typedef QT_MANGLE_NAMESPACE(QNSView) QNSV;
NSWindow *win = m_platformWindow->m_nsWindow;
NSView *parent = self.superview;
while (!win) {
if (![parent isKindOfClass:[QNSV class]])
break;
QCocoaWindow *platformWindow = static_cast<QNSV *>(parent)->m_platformWindow;
if (platformWindow)
win = platformWindow->m_nsWindow;
parent = parent.superview;
}
return win;
}
@end @end