356f5bbac3
The existing cursor logic had a couple of issues: - It made the faulty assumption that we could not use the NSWindow invalidateCursorRectsForView API for child NSViews. - It used NSWindow invalidateCursorRectsForView and NSView resetCursorRects. This API has been replaced by the more general NSTrackingArea API. - It did not implement falling back to the parent window cursor if the current window has no cursor set. Document that QWindow cursors work the same way as QWidget cursors in that a QWindow with no set cursor will fall back to the parent window cursor. Change the cocoa platform code to use NSTrackingArea exclusively and implement NSView cursorUpdate which sets the cursor. Handle immediate change on QWindow:: setCursor() manually. Add QWindow::effectiveWindowCursor() and applyEffectiveWindowCursor() which finds the correct window cursor. Add a manual test for the child window, child widget, and QWidget::createWindowChild cases. Task-number: QTBUG-33479 Task-number: QTBUG-52023 Change-Id: I0370e11bbadb2da95e8632e61be6228ec2cd5e9d Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
93 lines
2.9 KiB
C++
93 lines
2.9 KiB
C++
/****************************************************************************
|
|
**
|
|
** Copyright (C) 2016 The Qt Company Ltd.
|
|
** Contact: http://www.qt.io/licensing/
|
|
**
|
|
** This file is part of the test suite of the Qt Toolkit.
|
|
**
|
|
** $QT_BEGIN_LICENSE:LGPL21$
|
|
** Commercial License Usage
|
|
** Licensees holding valid commercial Qt licenses may use this file in
|
|
** accordance with the commercial license agreement provided with the
|
|
** Software or, alternatively, in accordance with the terms contained in
|
|
** a written agreement between you and The Qt Company. For licensing terms
|
|
** and conditions see http://www.qt.io/terms-conditions. For further
|
|
** information use the contact form at http://www.qt.io/contact-us.
|
|
**
|
|
** GNU Lesser General Public License Usage
|
|
** Alternatively, this file may be used under the terms of the GNU Lesser
|
|
** General Public License version 2.1 or version 3 as published by the Free
|
|
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
** following information to ensure the GNU Lesser General Public License
|
|
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
**
|
|
** As a special exception, The Qt Company gives you certain additional
|
|
** rights. These rights are described in The Qt Company LGPL Exception
|
|
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
**
|
|
** $QT_END_LICENSE$
|
|
**
|
|
****************************************************************************/
|
|
#include <QtWidgets>
|
|
|
|
class CursorWidget : public QWidget
|
|
{
|
|
public:
|
|
CursorWidget(QCursor cursor, QColor color)
|
|
:m_cursor(cursor)
|
|
,m_color(color)
|
|
{
|
|
if (cursor.shape() == Qt::ArrowCursor)
|
|
unsetCursor();
|
|
else
|
|
setCursor(cursor);
|
|
}
|
|
|
|
void paintEvent(QPaintEvent *e)
|
|
{
|
|
QPainter p(this);
|
|
p.fillRect(e->rect(), m_color);
|
|
}
|
|
|
|
void mousePressEvent(QMouseEvent *)
|
|
{
|
|
// Toggle cursor
|
|
QCursor newCursor = (cursor().shape() == m_cursor.shape()) ? QCursor() : m_cursor;
|
|
if (newCursor.shape() == Qt::ArrowCursor)
|
|
unsetCursor();
|
|
else
|
|
setCursor(newCursor);
|
|
}
|
|
|
|
private:
|
|
QCursor m_cursor;
|
|
QColor m_color;
|
|
};
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
QApplication app(argc, argv);
|
|
|
|
// Test child widgets (one of which is native) with set cursors.
|
|
// Click window to toggle cursor.
|
|
|
|
CursorWidget w1((QCursor(Qt::SizeVerCursor)), QColor(Qt::blue).darker());
|
|
w1.resize(200, 200);
|
|
w1.show();
|
|
|
|
CursorWidget w2((QCursor(Qt::OpenHandCursor)), QColor(Qt::red).darker());
|
|
w2.setParent(&w1);
|
|
w2.setGeometry(0, 0, 100, 100);
|
|
w2.show();
|
|
|
|
CursorWidget w3((QCursor(Qt::IBeamCursor)), QColor(Qt::green).darker());
|
|
w3.winId();
|
|
w3.setParent(&w1);
|
|
w3.setGeometry(100, 100, 100, 100);
|
|
w3.show();
|
|
|
|
return app.exec();
|
|
}
|