diff options
Diffstat (limited to 'src/widgets/kernel')
43 files changed, 867 insertions, 580 deletions
diff --git a/src/widgets/kernel/mac.pri b/src/widgets/kernel/mac.pri index 8c694c5e05..f7e7aa869a 100644 --- a/src/widgets/kernel/mac.pri +++ b/src/widgets/kernel/mac.pri @@ -1,4 +1,4 @@ -!x11:osx { +macos { LIBS_PRIVATE += -framework AppKit -lz *-mwerks:INCLUDEPATH += compat } diff --git a/src/widgets/kernel/qaction.cpp b/src/widgets/kernel/qaction.cpp index 7754defaac..967b0b8dde 100644 --- a/src/widgets/kernel/qaction.cpp +++ b/src/widgets/kernel/qaction.cpp @@ -45,6 +45,7 @@ #include "qapplication.h" #include "qevent.h" #include "qlist.h" +#include "qstylehints.h" #include <private/qshortcutmap_p.h> #include <private/qapplication_p.h> #if QT_CONFIG(menu) @@ -65,7 +66,7 @@ QT_BEGIN_NAMESPACE */ static QString qt_strippedText(QString s) { - s.remove(QStringLiteral("...")); + s.remove(QLatin1String("...")); for (int i = 0; i < s.size(); ++i) { if (s.at(i) == QLatin1Char('&')) s.remove(i, 1); @@ -77,6 +78,7 @@ static QString qt_strippedText(QString s) QActionPrivate::QActionPrivate() : group(0), enabled(1), forceDisabled(0), visible(1), forceInvisible(0), checkable(0), checked(0), separator(0), fontSet(false), iconVisibleInMenu(-1), + shortcutVisibleInContextMenu(-1), menuRole(QAction::TextHeuristicRole), priority(QAction::NormalPriority) { @@ -1282,8 +1284,7 @@ void QAction::setIconVisibleInMenu(bool visible) d->iconVisibleInMenu = visible; // Only send data changed if we really need to. if (oldValue != -1 - || (oldValue == -1 - && visible == !QApplication::instance()->testAttribute(Qt::AA_DontShowIconsInMenus))) { + || visible == !QApplication::instance()->testAttribute(Qt::AA_DontShowIconsInMenus)) { d->sendDataChanged(); } } @@ -1298,6 +1299,46 @@ bool QAction::isIconVisibleInMenu() const return d->iconVisibleInMenu; } +/*! + \property QAction::shortcutVisibleInContextMenu + \brief Whether or not an action should show a shortcut in a context menu + \since 5.10 + + In some applications, it may make sense to have actions with shortcuts in + context menus. If true, the shortcut (if valid) is shown when the action is + shown via a context menu, when it is false, it is not shown. + + The default is to follow whether the Qt::AA_DontShowShortcutsInContextMenus attribute + is set for the application, falling back to the widget style hint. + Explicitly setting this property overrides the presence (or abscence) of the attribute. + + \sa QAction::shortcut, QCoreApplication::setAttribute() +*/ +void QAction::setShortcutVisibleInContextMenu(bool visible) +{ + Q_D(QAction); + if (d->shortcutVisibleInContextMenu == -1 || visible != bool(d->shortcutVisibleInContextMenu)) { + int oldValue = d->shortcutVisibleInContextMenu; + d->shortcutVisibleInContextMenu = visible; + // Only send data changed if we really need to. + if (oldValue != -1 + || visible == !QApplication::instance()->testAttribute(Qt::AA_DontShowShortcutsInContextMenus)) { + d->sendDataChanged(); + } + } +} + +bool QAction::isShortcutVisibleInContextMenu() const +{ + Q_D(const QAction); + if (d->shortcutVisibleInContextMenu == -1) { + if (QApplication::instance()->testAttribute(Qt::AA_DontShowIconsInMenus)) + return false; + return qApp->styleHints()->showShortcutsInContextMenus(); + } + return d->shortcutVisibleInContextMenu; +} + #ifndef QT_NO_DEBUG_STREAM Q_WIDGETS_EXPORT QDebug operator<<(QDebug d, const QAction *action) { diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index 41e29e6ab9..84bf92d2ac 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -80,6 +80,7 @@ class Q_WIDGETS_EXPORT QAction : public QObject Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY changed) Q_PROPERTY(MenuRole menuRole READ menuRole WRITE setMenuRole NOTIFY changed) Q_PROPERTY(bool iconVisibleInMenu READ isIconVisibleInMenu WRITE setIconVisibleInMenu NOTIFY changed) + Q_PROPERTY(bool shortcutVisibleInContextMenu READ isShortcutVisibleInContextMenu WRITE setShortcutVisibleInContextMenu NOTIFY changed) Q_PROPERTY(Priority priority READ priority WRITE setPriority) public: @@ -160,7 +161,7 @@ public: enum ActionEvent { Trigger, Hover }; void activate(ActionEvent event); - bool showStatusText(QWidget *widget = Q_NULLPTR); + bool showStatusText(QWidget *widget = nullptr); void setMenuRole(MenuRole menuRole); MenuRole menuRole() const; @@ -168,6 +169,8 @@ public: void setIconVisibleInMenu(bool visible); bool isIconVisibleInMenu() const; + void setShortcutVisibleInContextMenu(bool show); + bool isShortcutVisibleInContextMenu() const; QWidget *parentWidget() const; @@ -177,7 +180,7 @@ public: #endif protected: - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; QAction(QActionPrivate &dd, QObject *parent); public Q_SLOTS: diff --git a/src/widgets/kernel/qaction_p.h b/src/widgets/kernel/qaction_p.h index 992323f308..19ae47c7b9 100644 --- a/src/widgets/kernel/qaction_p.h +++ b/src/widgets/kernel/qaction_p.h @@ -109,7 +109,8 @@ public: uint separator : 1; uint fontSet : 1; - int iconVisibleInMenu : 3; // Only has values -1, 0, and 1 + int iconVisibleInMenu : 2; // Only has values -1, 0, and 1 + int shortcutVisibleInContextMenu : 2; // Only has values -1, 0, and 1 QAction::MenuRole menuRole; QAction::Priority priority; diff --git a/src/widgets/kernel/qapplication.cpp b/src/widgets/kernel/qapplication.cpp index 26e9ffbbf0..9e4910ebd0 100644 --- a/src/widgets/kernel/qapplication.cpp +++ b/src/widgets/kernel/qapplication.cpp @@ -152,20 +152,6 @@ static void clearSystemPalette() QApplicationPrivate::sys_pal = 0; } -static QByteArray get_style_class_name() -{ - QScopedPointer<QStyle> s(QStyleFactory::create(QApplicationPrivate::desktopStyleKey())); - if (!s.isNull()) - return s->metaObject()->className(); - return QByteArray(); -} - -static QByteArray nativeStyleClassName() -{ - static QByteArray name = get_style_class_name(); - return name; -} - bool QApplicationPrivate::autoSipEnabled = true; QApplicationPrivate::QApplicationPrivate(int &argc, char **argv, int flags) @@ -395,8 +381,6 @@ void qt_init_tooltip_palette(); void qt_cleanup(); QStyle *QApplicationPrivate::app_style = 0; // default application style -bool QApplicationPrivate::overrides_native_style = false; // whether native QApplication style is - // overridden, i.e. not native #ifndef QT_NO_STYLE_STYLESHEET QString QApplicationPrivate::styleSheet; // default application stylesheet #endif @@ -1091,8 +1075,6 @@ QStyle *QApplication::style() Q_ASSERT(!"No styles available!"); return 0; } - QApplicationPrivate::overrides_native_style = - app_style->objectName() != QApplicationPrivate::desktopStyleKey(); } // take ownership of the style QApplicationPrivate::app_style->setParent(qApp); @@ -1157,9 +1139,6 @@ void QApplication::setStyle(QStyle *style) QStyle *old = QApplicationPrivate::app_style; // save - QApplicationPrivate::overrides_native_style = - nativeStyleClassName() == QByteArray(style->metaObject()->className()); - #ifndef QT_NO_STYLE_STYLESHEET if (!QApplicationPrivate::styleSheet.isEmpty() && !qobject_cast<QStyleSheetStyle *>(style)) { // we have a stylesheet already and a new style is being set @@ -1236,7 +1215,7 @@ void QApplication::setStyle(QStyle *style) Requests a QStyle object for \a style from the QStyleFactory. The string must be one of the QStyleFactory::keys(), typically one of - "windows", "fusion", "windowsxp", or "macintosh". Style + "windows", "windowsvista", "fusion", or "macintosh". Style names are case insensitive. Returns 0 if an unknown \a style is passed, otherwise the QStyle object @@ -1479,8 +1458,8 @@ void QApplicationPrivate::setPalette_helper(const QPalette &palette, const char* "selection-background-color" and "alternate-background-color". \note Some styles do not use the palette for all drawing, for instance, if - they make use of native theme engines. This is the case for the Windows XP, - Windows Vista, and \macos styles. + they make use of native theme engines. This is the case for the + Windows Vista and \macos styles. \sa QWidget::setPalette(), palette(), QStyle::polish() */ @@ -2228,8 +2207,15 @@ QWidget *QApplicationPrivate::focusNextPrevChild_helper(QWidget *toplevel, bool if (test->isWindow()) seenWindow = true; + // If the next focus widget has a focus proxy, we need to check to ensure + // that the proxy is in the correct parent-child direction (according to + // \a next). This is to ensure that we can tab in and out of compound widgets + // without getting stuck in a tab-loop between parent and child. + QWidget *focusProxy = test->d_func()->deepestFocusProxy(); + if ((test->focusPolicy() & focus_flag) == focus_flag - && !(test->d_func()->extra && test->d_func()->extra->focus_proxy) + && !(next && focusProxy && focusProxy->isAncestorOf(test)) + && !(!next && focusProxy && test->isAncestorOf(focusProxy)) && test->isVisibleTo(toplevel) && test->isEnabled() && !(w->windowType() == Qt::SubWindow && !w->isAncestorOf(test)) && (toplevel->windowType() != Qt::SubWindow || toplevel->isAncestorOf(test))) { @@ -2735,7 +2721,7 @@ bool QApplicationPrivate::sendMouseEvent(QWidget *receiver, QMouseEvent *event, case enter/leave events are genereated by the underlying windowing system. */ extern QPointer<QWidget> qt_last_mouse_receiver; -extern QWidget *qt_button_down; +extern Q_WIDGETS_EXPORT QWidget *qt_button_down; void QApplicationPrivate::sendSyntheticEnterLeave(QWidget *widget) { #ifndef QT_NO_CURSOR @@ -2797,7 +2783,7 @@ void QApplicationPrivate::sendSyntheticEnterLeave(QWidget *widget) */ QDesktopWidget *QApplication::desktop() { - CHECK_QAPP_INSTANCE(Q_NULLPTR) + CHECK_QAPP_INSTANCE(nullptr) if (!qt_desktopWidget || // not created yet !(qt_desktopWidget->windowType() == Qt::Desktop)) { // reparented away qt_desktopWidget = new QDesktopWidget(); @@ -2964,6 +2950,9 @@ bool QApplication::notify(QObject *receiver, QEvent *e) // required in order to support Qt Test synthesized events. Real mouse // and keyboard state updates from the platform plugin are managed by // QGuiApplicationPrivate::process(Mouse|Wheel|Key|Touch|Tablet)Event(); + // ### FIXME: Qt Test should not call qapp->notify(), but rather route + // the events through the proper QPA interface. This is required to + // properly generate all other events such as enter/leave etc. switch (e->type()) { case QEvent::MouseButtonPress: { @@ -3068,7 +3057,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) case QEvent::MouseButtonRelease: case QEvent::MouseButtonDblClick: d->toolTipFallAsleep.stop(); - // fall-through + Q_FALLTHROUGH(); case QEvent::Leave: d->toolTipWakeUp.stop(); default: @@ -3274,7 +3263,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) // sequence, so we reset wheel_widget in case no one accepts the event // or if we didn't get (or missed) a ScrollEnd previously. if (spontaneous && phase == Qt::ScrollBegin) - QApplicationPrivate::wheel_widget = Q_NULLPTR; + QApplicationPrivate::wheel_widget = nullptr; const QPoint &relpos = wheel->pos(); @@ -3324,7 +3313,7 @@ bool QApplication::notify(QObject *receiver, QEvent *e) d->notify_helper(QApplicationPrivate::wheel_widget, &we); wheel->setAccepted(we.isAccepted()); if (phase == Qt::ScrollEnd) - QApplicationPrivate::wheel_widget = Q_NULLPTR; + QApplicationPrivate::wheel_widget = nullptr; } } break; @@ -3760,7 +3749,6 @@ static void grabForPopup(QWidget *popup) } } -extern QWidget *qt_button_down; extern QWidget *qt_popup_down; extern bool qt_replay_popup_mouse_event; diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 396d0c9474..7a5d7ba1a9 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -110,11 +110,11 @@ public: using QGuiApplication::palette; static QPalette palette(const QWidget *); static QPalette palette(const char *className); - static void setPalette(const QPalette &, const char* className = Q_NULLPTR); + static void setPalette(const QPalette &, const char* className = nullptr); static QFont font(); static QFont font(const QWidget*); static QFont font(const char *className); - static void setFont(const QFont &, const char* className = Q_NULLPTR); + static void setFont(const QFont &, const char* className = nullptr); static QFontMetrics fontMetrics(); #if QT_VERSION < 0x060000 // remove these forwarders in Qt 6 @@ -177,7 +177,7 @@ public: #endif static int exec(); - bool notify(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool notify(QObject *, QEvent *) override; #ifdef QT_KEYPAD_NAVIGATION static Q_DECL_DEPRECATED void setKeypadNavigationEnabled(bool); @@ -201,8 +201,8 @@ public Q_SLOTS: static void aboutQt(); protected: - bool event(QEvent *) Q_DECL_OVERRIDE; - bool compressEvent(QEvent *, QObject *receiver, QPostEventList *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + bool compressEvent(QEvent *, QObject *receiver, QPostEventList *) override; private: Q_DISABLE_COPY(QApplication) diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index 36de3cacaa..9983cc7d9e 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -92,7 +92,7 @@ extern QClipboard *qt_clipboard; #endif typedef QHash<QByteArray, QFont> FontHash; -FontHash *qt_app_fonts_hash(); +Q_WIDGETS_EXPORT FontHash *qt_app_fonts_hash(); typedef QHash<QByteArray, QPalette> PaletteHash; PaletteHash *qt_app_palettes_hash(); @@ -106,11 +106,11 @@ public: QApplicationPrivate(int &argc, char **argv, int flags); ~QApplicationPrivate(); - virtual void notifyLayoutDirectionChange() Q_DECL_OVERRIDE; - virtual void notifyActiveWindowChange(QWindow *) Q_DECL_OVERRIDE; + virtual void notifyLayoutDirectionChange() override; + virtual void notifyActiveWindowChange(QWindow *) override; - virtual bool shouldQuit() Q_DECL_OVERRIDE; - bool tryCloseAllWindows() Q_DECL_OVERRIDE; + virtual bool shouldQuit() override; + bool tryCloseAllWindows() override; #if 0 // Used to be included in Qt4 for Q_WS_X11 #ifndef QT_NO_SETTINGS @@ -122,13 +122,13 @@ public: static QString desktopStyleKey(); - void createEventDispatcher() Q_DECL_OVERRIDE; + void createEventDispatcher() override; static void dispatchEnterLeave(QWidget *enter, QWidget *leave, const QPointF &globalPosF); - void notifyWindowIconChanged() Q_DECL_OVERRIDE; + void notifyWindowIconChanged() override; //modality - bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const Q_DECL_OVERRIDE; + bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const override; static bool isBlockedByModal(QWidget *widget); static bool modalState(); static bool tryModalHelper(QWidget *widget, QWidget **rettop = 0); @@ -137,12 +137,6 @@ public: bool canQuit(); #endif - //style - static bool usesNativeStyle() - { - return !overrides_native_style; - } - bool notify_helper(QObject *receiver, QEvent * e); void init( @@ -158,7 +152,7 @@ public: #endif static bool inPopupMode(); - bool popupActive() Q_DECL_OVERRIDE { return inPopupMode(); } + bool popupActive() override { return inPopupMode(); } void closePopup(QWidget *popup); void openPopup(QWidget *popup); static void setFocusWidget(QWidget *focus, Qt::FocusReason reason); @@ -178,14 +172,13 @@ public: static QSize app_strut; static QWidgetList *popupWidgets; static QStyle *app_style; - static bool overrides_native_style; static QPalette *sys_pal; static QPalette *set_pal; protected: - void notifyThemeChanged() Q_DECL_OVERRIDE; + void notifyThemeChanged() override; #ifndef QT_NO_DRAGANDDROP - void notifyDragStarted(const QDrag *) Q_DECL_OVERRIDE; + void notifyDragStarted(const QDrag *) override; #endif // QT_NO_DRAGANDDROP public: @@ -284,7 +277,7 @@ public: ulong timestamp); static void translateTouchCancel(QTouchDevice *device, ulong timestamp); - QPixmap applyQIconStyleHelper(QIcon::Mode mode, const QPixmap& base) const Q_DECL_OVERRIDE; + QPixmap applyQIconStyleHelper(QIcon::Mode mode, const QPixmap& base) const override; private: static QApplicationPrivate *self; static bool tryCloseAllWidgetWindows(QWindowList *processedWindows); diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp index f2e3df5314..a368f379ad 100644 --- a/src/widgets/kernel/qboxlayout.cpp +++ b/src/widgets/kernel/qboxlayout.cpp @@ -124,7 +124,7 @@ public: void calcHfw(int); void effectiveMargins(int *left, int *top, int *right, int *bottom) const; - QLayoutItem* replaceAt(int index, QLayoutItem*) Q_DECL_OVERRIDE; + QLayoutItem* replaceAt(int index, QLayoutItem*) override; }; QBoxLayoutPrivate::~QBoxLayoutPrivate() @@ -873,15 +873,9 @@ void QBoxLayout::insertSpacing(int index, int size) else b = QLayoutPrivate::createSpacerItem(this, 0, size, QSizePolicy::Minimum, QSizePolicy::Fixed); - QT_TRY { - QBoxLayoutItem *it = new QBoxLayoutItem(b); - it->magic = true; - d->list.insert(index, it); - - } QT_CATCH(...) { - delete b; - QT_RETHROW; - } + QBoxLayoutItem *it = new QBoxLayoutItem(b); + it->magic = true; + d->list.insert(index, it); invalidate(); } @@ -985,20 +979,8 @@ void QBoxLayout::insertWidget(int index, QWidget *widget, int stretch, QWidgetItem *b = QLayoutPrivate::createWidgetItem(this, widget); b->setAlignment(alignment); - QBoxLayoutItem *it; - QT_TRY{ - it = new QBoxLayoutItem(b, stretch); - } QT_CATCH(...) { - delete b; - QT_RETHROW; - } - - QT_TRY{ - d->list.insert(index, it); - } QT_CATCH(...) { - delete it; - QT_RETHROW; - } + QBoxLayoutItem *it = new QBoxLayoutItem(b, stretch); + d->list.insert(index, it); invalidate(); } diff --git a/src/widgets/kernel/qboxlayout.h b/src/widgets/kernel/qboxlayout.h index 9c7d0e593f..6bb8f8aafa 100644 --- a/src/widgets/kernel/qboxlayout.h +++ b/src/widgets/kernel/qboxlayout.h @@ -61,7 +61,7 @@ public: enum Direction { LeftToRight, RightToLeft, TopToBottom, BottomToTop, Down = TopToBottom, Up = BottomToTop }; - explicit QBoxLayout(Direction, QWidget *parent = Q_NULLPTR); + explicit QBoxLayout(Direction, QWidget *parent = nullptr); ~QBoxLayout(); @@ -74,7 +74,7 @@ public: void addWidget(QWidget *, int stretch = 0, Qt::Alignment alignment = Qt::Alignment()); void addLayout(QLayout *layout, int stretch = 0); void addStrut(int); - void addItem(QLayoutItem *) Q_DECL_OVERRIDE; + void addItem(QLayoutItem *) override; void insertSpacing(int index, int size); void insertStretch(int index, int stretch = 0); @@ -91,20 +91,20 @@ public: void setStretch(int index, int stretch); int stretch(int index) const; - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSize() const override; + QSize maximumSize() const override; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int) const Q_DECL_OVERRIDE; - int minimumHeightForWidth(int) const Q_DECL_OVERRIDE; + bool hasHeightForWidth() const override; + int heightForWidth(int) const override; + int minimumHeightForWidth(int) const override; - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - void invalidate() Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; - void setGeometry(const QRect&) Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; + void invalidate() override; + QLayoutItem *itemAt(int) const override; + QLayoutItem *takeAt(int) override; + int count() const override; + void setGeometry(const QRect&) override; private: Q_DISABLE_COPY(QBoxLayout) diff --git a/src/widgets/kernel/qdesktopwidget.cpp b/src/widgets/kernel/qdesktopwidget.cpp index 1e6fbfd239..5fb7882932 100644 --- a/src/widgets/kernel/qdesktopwidget.cpp +++ b/src/widgets/kernel/qdesktopwidget.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE QDesktopScreenWidget::QDesktopScreenWidget(QScreen *screen, const QRect &geometry) - : QWidget(Q_NULLPTR, Qt::Desktop), m_screen(screen) + : QWidget(nullptr, Qt::Desktop), m_screen(screen) { setVisible(false); if (QWindow *winHandle = windowHandle()) @@ -73,6 +73,11 @@ int QDesktopScreenWidget::screenNumber() const const QRect QDesktopWidget::screenGeometry(const QWidget *widget) const { + return QDesktopWidgetPrivate::screenGeometry(widget); +} + +const QRect QDesktopWidgetPrivate::screenGeometry(const QWidget *widget) +{ if (Q_UNLIKELY(!widget)) { qWarning("QDesktopWidget::screenGeometry(): Attempt " "to get the screen geometry of a null widget"); @@ -86,6 +91,11 @@ const QRect QDesktopWidget::screenGeometry(const QWidget *widget) const const QRect QDesktopWidget::availableGeometry(const QWidget *widget) const { + return QDesktopWidgetPrivate::availableGeometry(widget); +} + +const QRect QDesktopWidgetPrivate::availableGeometry(const QWidget *widget) +{ if (Q_UNLIKELY(!widget)) { qWarning("QDesktopWidget::availableGeometry(): Attempt " "to get the available geometry of a null widget"); @@ -104,7 +114,7 @@ QDesktopScreenWidget *QDesktopWidgetPrivate::widgetForScreen(QScreen *qScreen) c if (widget->screen() == qScreen) return widget; } - return Q_NULLPTR; + return nullptr; } void QDesktopWidgetPrivate::_q_updateScreens() @@ -166,17 +176,26 @@ void QDesktopWidgetPrivate::_q_updateScreens() // Notice that we trigger screenCountChanged even if a screen was removed and another one added, // in which case the total number of screens did not change. This is the only way for applications // to notice that a screen was swapped out against another one. +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED emit q->screenCountChanged(targetLength); +QT_WARNING_POP } foreach (int changedScreen, changedScreens) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED emit q->resized(changedScreen); +QT_WARNING_POP } void QDesktopWidgetPrivate::_q_availableGeometryChanged() { Q_Q(QDesktopWidget); if (QScreen *screen = qobject_cast<QScreen *>(q->sender())) +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED emit q->workAreaResized(QGuiApplication::screens().indexOf(screen)); +QT_WARNING_POP } QDesktopWidget::QDesktopWidget() @@ -195,16 +214,51 @@ QDesktopWidget::~QDesktopWidget() bool QDesktopWidget::isVirtualDesktop() const { + return QDesktopWidgetPrivate::isVirtualDesktop(); +} + +bool QDesktopWidgetPrivate::isVirtualDesktop() +{ return QGuiApplication::primaryScreen()->virtualSiblings().size() > 1; } +QRect QDesktopWidgetPrivate::geometry() +{ + return QGuiApplication::primaryScreen()->virtualGeometry(); +} + +QSize QDesktopWidgetPrivate::size() +{ + return geometry().size(); +} + +int QDesktopWidgetPrivate::width() +{ + return geometry().width(); +} + +int QDesktopWidgetPrivate::height() +{ + return geometry().height(); +} + int QDesktopWidget::primaryScreen() const { + return QDesktopWidgetPrivate::primaryScreen(); +} + +int QDesktopWidgetPrivate::primaryScreen() +{ return 0; } int QDesktopWidget::numScreens() const { + return QDesktopWidgetPrivate::numScreens(); +} + +int QDesktopWidgetPrivate::numScreens() +{ return qMax(QGuiApplication::screens().size(), 1); } @@ -218,28 +272,33 @@ QWidget *QDesktopWidget::screen(int screen) const QRect QDesktopWidget::availableGeometry(int screenNo) const { - QList<QScreen *> screens = QGuiApplication::screens(); - if (screenNo == -1) - screenNo = 0; - if (screenNo < 0 || screenNo >= screens.size()) - return QRect(); - else - return screens.at(screenNo)->availableGeometry(); + return QDesktopWidgetPrivate::availableGeometry(screenNo); +} + +const QRect QDesktopWidgetPrivate::availableGeometry(int screenNo) +{ + const QScreen *screen = QDesktopWidgetPrivate::screen(screenNo); + return screen ? screen->availableGeometry() : QRect(); } const QRect QDesktopWidget::screenGeometry(int screenNo) const { - QList<QScreen *> screens = QGuiApplication::screens(); - if (screenNo == -1) - screenNo = 0; - if (screenNo < 0 || screenNo >= screens.size()) - return QRect(); - else - return screens.at(screenNo)->geometry(); + return QDesktopWidgetPrivate::screenGeometry(screenNo); +} + +const QRect QDesktopWidgetPrivate::screenGeometry(int screenNo) +{ + const QScreen *screen = QDesktopWidgetPrivate::screen(screenNo); + return screen ? screen->geometry() : QRect(); } int QDesktopWidget::screenNumber(const QWidget *w) const { + return QDesktopWidgetPrivate::screenNumber(w); +} + +int QDesktopWidgetPrivate::screenNumber(const QWidget *w) +{ if (!w) return primaryScreen(); @@ -270,7 +329,7 @@ int QDesktopWidget::screenNumber(const QWidget *w) const if (!w->isWindow()) frame.moveTopLeft(w->mapToGlobal(QPoint(0, 0))); - QScreen *widgetScreen = Q_NULLPTR; + QScreen *widgetScreen = nullptr; int largestArea = 0; foreach (QScreen *screen, screens) { const QRect deviceIndependentScreenGeometry = @@ -287,26 +346,23 @@ int QDesktopWidget::screenNumber(const QWidget *w) const int QDesktopWidget::screenNumber(const QPoint &p) const { - const QList<QScreen *> screens = QGuiApplication::screens(); - if (!screens.isEmpty()) { - const QList<QScreen *> primaryScreens = screens.first()->virtualSiblings(); - // Find the screen index on the primary virtual desktop first - foreach (QScreen *screen, primaryScreens) { - if (screen->geometry().contains(p)) - return screens.indexOf(screen); - } - // If the screen index is not found on primary virtual desktop, find - // the screen index on all screens except the first which was for - // sure in the previous loop. Some other screens may repeat. Find - // only when there is more than one virtual desktop. - if (screens.count() != primaryScreens.count()) { - for (int i = 1; i < screens.size(); ++i) { - if (screens[i]->geometry().contains(p)) - return i; - } - } - } - return primaryScreen(); //even better would be closest screen + return QDesktopWidgetPrivate::screenNumber(p); +} + +int QDesktopWidgetPrivate::screenNumber(const QPoint &p) +{ + QScreen *screen = QGuiApplication::screenAt(p); + return screen ? QGuiApplication::screens().indexOf(screen) : primaryScreen(); +} + +QScreen *QDesktopWidgetPrivate::screen(int screenNo) +{ + QList<QScreen *> screens = QGuiApplication::screens(); + if (screenNo == -1) + screenNo = 0; + if (screenNo < 0 || screenNo >= screens.size()) + return nullptr; + return screens.at(screenNo); } void QDesktopWidget::resizeEvent(QResizeEvent *) diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h index 64e1c568eb..f53d0fe9bb 100644 --- a/src/widgets/kernel/qdesktopwidget.h +++ b/src/widgets/kernel/qdesktopwidget.h @@ -59,35 +59,48 @@ public: QDesktopWidget(); ~QDesktopWidget(); - bool isVirtualDesktop() const; + int screenNumber(const QWidget *widget = nullptr) const; + const QRect screenGeometry(const QWidget *widget) const; + const QRect availableGeometry(const QWidget *widget) const; - int numScreens() const; - int screenCount() const; - int primaryScreen() const; +#if QT_DEPRECATED_SINCE(5, 11) + QT_DEPRECATED_X("Use QScreen::virtualSiblings() of primary screen") bool isVirtualDesktop() const; - int screenNumber(const QWidget *widget = Q_NULLPTR) const; - int screenNumber(const QPoint &) const; + QT_DEPRECATED_X("Use QGuiApplication::screens()") int numScreens() const; + QT_DEPRECATED_X("Use QGuiApplication::screens()") int screenCount() const; + QT_DEPRECATED_X("Use QGuiApplication::primaryScreen()") int primaryScreen() const; - QWidget *screen(int screen = -1); + QT_DEPRECATED_X("Use QGuiApplication::screenAt()") int screenNumber(const QPoint &) const; - const QRect screenGeometry(int screen = -1) const; - const QRect screenGeometry(const QWidget *widget) const; - const QRect screenGeometry(const QPoint &point) const - { return screenGeometry(screenNumber(point)); } + QT_DEPRECATED_X("Use QScreen") QWidget *screen(int screen = -1); - const QRect availableGeometry(int screen = -1) const; - const QRect availableGeometry(const QWidget *widget) const; - const QRect availableGeometry(const QPoint &point) const - { return availableGeometry(screenNumber(point)); } + QT_DEPRECATED_X("Use QGuiApplication::screens()") const QRect screenGeometry(int screen = -1) const; + QT_DEPRECATED_X("Use QGuiApplication::screenAt()") const QRect screenGeometry(const QPoint &point) const + { +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED + return screenGeometry(screenNumber(point)); +QT_WARNING_POP + } + + QT_DEPRECATED_X("Use QGuiApplication::screens()") const QRect availableGeometry(int screen = -1) const; + QT_DEPRECATED_X("Use QGuiApplication::screenAt()") const QRect availableGeometry(const QPoint &point) const + { +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED + return availableGeometry(screenNumber(point)); +QT_WARNING_POP + } Q_SIGNALS: - void resized(int); - void workAreaResized(int); - void screenCountChanged(int); - void primaryScreenChanged(); + QT_DEPRECATED_X("Use QScreen::geometryChanged()") void resized(int); + QT_DEPRECATED_X("Use QScreen::availableGeometryChanged()") void workAreaResized(int); + QT_DEPRECATED_X("Use QGuiApplication::screenAdded/Removed()") void screenCountChanged(int); + QT_DEPRECATED_X("Use QGuiApplication::primaryScreenChanged()") void primaryScreenChanged(); +#endif protected: - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *e) override; private: Q_DISABLE_COPY(QDesktopWidget) @@ -100,7 +113,12 @@ private: }; inline int QDesktopWidget::screenCount() const -{ return numScreens(); } +{ +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED + return numScreens(); +QT_WARNING_POP +} QT_END_NAMESPACE diff --git a/src/widgets/kernel/qdesktopwidget.qdoc b/src/widgets/kernel/qdesktopwidget.qdoc index 27d05ece8c..dd2d9535ae 100644 --- a/src/widgets/kernel/qdesktopwidget.qdoc +++ b/src/widgets/kernel/qdesktopwidget.qdoc @@ -32,6 +32,7 @@ \ingroup advanced \ingroup desktop \inmodule QtWidgets + \obsolete Systems with more than one graphics card and monitor can manage the physical screen space available either as multiple desktops, or as a @@ -125,7 +126,7 @@ \obsolete - This function is deprecated. Use screenCount instead. + Use QGuiApplication::screens() instead. \sa primaryScreen */ @@ -140,6 +141,10 @@ have the geometry of the entire virtual desktop; i.e., bounding every \a screen. + \obsolete + + Use QScreen instead. + \sa primaryScreen, screenCount, virtualDesktop */ @@ -152,7 +157,11 @@ on \macos, or the task bar on Windows). The default screen is used if \a screen is -1. - \sa screenNumber(), screenGeometry() + \obsolete + + Use QGuiApplication::screens() instead. + + \sa screenNumber(), screenGeometry(), QScreen::availableGeometry() */ /*! @@ -170,6 +179,10 @@ Returns the available geometry of the screen which contains \a p. + \obsolete + + Use QGuiApplication::screenAt() instead. + \sa screenGeometry() */ @@ -180,6 +193,10 @@ Returns the geometry of the screen with index \a screen. The default screen is used if \a screen is -1. + \obsolete + + Use QGuiApplication::screens() instead. + \sa screenNumber() */ @@ -195,6 +212,10 @@ \overload Returns the geometry of the screen which contains \a p. + + \obsolete + + Use QGuiApplication::screenAt() instead. */ @@ -214,30 +235,47 @@ Returns the index of the screen that contains the \a point, or the screen which is the shortest distance from the \a point. + \obsolete + + Use QGuiApplication::screenAt() instead. + \sa primaryScreen */ /*! \fn void QDesktopWidget::resizeEvent(QResizeEvent *event) \reimp + \internal */ /*! \fn void QDesktopWidget::resized(int screen) This signal is emitted when the size of \a screen changes. + + \obsolete + + Use QScreen::geometryChanged() instead. */ /*! \fn void QDesktopWidget::workAreaResized(int screen) This signal is emitted when the work area available on \a screen changes. + + \obsolete + + Use QScreen::availableGeometryChanged() instead. */ /*! \property QDesktopWidget::screenCount \brief the number of screens currently available on the system. + \obsolete + + Use QGuiApplication::screens() instead. + \since 4.6 */ @@ -245,6 +283,10 @@ \property QDesktopWidget::primaryScreen \brief the index of the screen that is configured to be the primary screen on the system. + + \obsolete + + Use QGuiApplication::primaryScreen() instead. */ /*! @@ -255,6 +297,10 @@ For virtual desktops, screen() will always return the same widget. The size of the virtual desktop is the size of this desktop widget. + + \obsolete + + Use QScreen::virtualSiblings() of primary screen instead. */ /*! @@ -264,6 +310,10 @@ This signal is emitted when the number of screens changes to \a newCount. + \obsolete + + Use QGuiApplication::screenAdded and QGuiApplication::screenRemoved() instead. + \sa screenCount */ @@ -278,5 +328,9 @@ \note This doesn't mean the QDesktopWidget::primaryScreen index will necessarily be different, but now it will refer to the new primary screen. + \obsolete + + Use QGuiApplication::primaryScreenChanged() instead. + \sa primaryScreen, screenGeometry() */ diff --git a/src/widgets/kernel/qdesktopwidget_p.h b/src/widgets/kernel/qdesktopwidget_p.h index dade4fe45e..69f87337b3 100644 --- a/src/widgets/kernel/qdesktopwidget_p.h +++ b/src/widgets/kernel/qdesktopwidget_p.h @@ -87,6 +87,31 @@ public: void _q_availableGeometryChanged(); QDesktopScreenWidget *widgetForScreen(QScreen *qScreen) const; + static bool isVirtualDesktop(); + + static QRect geometry(); + static QSize size(); + static int width(); + static int height(); + + static int numScreens(); + static int primaryScreen(); + + static int screenNumber(const QWidget *widget = nullptr); + static int screenNumber(const QPoint &); + + static QScreen *screen(int screenNo = -1); + + static const QRect screenGeometry(int screen = -1); + static const QRect screenGeometry(const QWidget *widget); + static const QRect screenGeometry(const QPoint &point) + { return screenGeometry(screenNumber(point)); } + + static const QRect availableGeometry(int screen = -1); + static const QRect availableGeometry(const QWidget *widget); + static const QRect availableGeometry(const QPoint &point) + { return availableGeometry(screenNumber(point)); } + QList<QDesktopScreenWidget *> screens; }; diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp index 868ac17b6f..8a5b863bb5 100644 --- a/src/widgets/kernel/qformlayout.cpp +++ b/src/widgets/kernel/qformlayout.cpp @@ -224,7 +224,7 @@ public: int hSpacing; int vSpacing; - QLayoutItem* replaceAt(int index, QLayoutItem*) Q_DECL_OVERRIDE; + QLayoutItem* replaceAt(int index, QLayoutItem*) override; }; QFormLayoutPrivate::QFormLayoutPrivate() diff --git a/src/widgets/kernel/qformlayout.h b/src/widgets/kernel/qformlayout.h index 5ec27433d3..40424f2a49 100644 --- a/src/widgets/kernel/qformlayout.h +++ b/src/widgets/kernel/qformlayout.h @@ -88,7 +88,7 @@ public: QLayoutItem *fieldItem; }; - explicit QFormLayout(QWidget *parent = Q_NULLPTR); + explicit QFormLayout(QWidget *parent = nullptr); ~QFormLayout(); void setFieldGrowthPolicy(FieldGrowthPolicy policy); @@ -142,19 +142,19 @@ public: QWidget *labelForField(QLayout *field) const; // reimplemented from QLayout - void addItem(QLayoutItem *item) Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int index) Q_DECL_OVERRIDE; - - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; - void invalidate() Q_DECL_OVERRIDE; - - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int width) const Q_DECL_OVERRIDE; - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; + void addItem(QLayoutItem *item) override; + QLayoutItem *itemAt(int index) const override; + QLayoutItem *takeAt(int index) override; + + void setGeometry(const QRect &rect) override; + QSize minimumSize() const override; + QSize sizeHint() const override; + void invalidate() override; + + bool hasHeightForWidth() const override; + int heightForWidth(int width) const override; + Qt::Orientations expandingDirections() const override; + int count() const override; int rowCount() const; diff --git a/src/widgets/kernel/qgesture.h b/src/widgets/kernel/qgesture.h index 1eda611d64..c5b2cee83d 100644 --- a/src/widgets/kernel/qgesture.h +++ b/src/widgets/kernel/qgesture.h @@ -70,7 +70,7 @@ class Q_WIDGETS_EXPORT QGesture : public QObject Q_PROPERTY(bool hasHotSpot READ hasHotSpot) public: - explicit QGesture(QObject *parent = Q_NULLPTR); + explicit QGesture(QObject *parent = nullptr); ~QGesture(); Qt::GestureType gestureType() const; @@ -114,7 +114,7 @@ class Q_WIDGETS_EXPORT QPanGesture : public QGesture Q_PRIVATE_PROPERTY(QPanGesture::d_func(), qreal verticalVelocity READ verticalVelocity WRITE setVerticalVelocity) public: - explicit QPanGesture(QObject *parent = Q_NULLPTR); + explicit QPanGesture(QObject *parent = nullptr); ~QPanGesture(); QPointF lastOffset() const; @@ -162,7 +162,7 @@ public: Q_PROPERTY(QPointF centerPoint READ centerPoint WRITE setCenterPoint) public: - explicit QPinchGesture(QObject *parent = Q_NULLPTR); + explicit QPinchGesture(QObject *parent = nullptr); ~QPinchGesture(); ChangeFlags totalChangeFlags() const; @@ -218,7 +218,7 @@ public: enum SwipeDirection { NoDirection, Left, Right, Up, Down }; Q_ENUM(SwipeDirection) - explicit QSwipeGesture(QObject *parent = Q_NULLPTR); + explicit QSwipeGesture(QObject *parent = nullptr); ~QSwipeGesture(); SwipeDirection horizontalDirection() const; @@ -239,7 +239,7 @@ class Q_WIDGETS_EXPORT QTapGesture : public QGesture Q_PROPERTY(QPointF position READ position WRITE setPosition) public: - explicit QTapGesture(QObject *parent = Q_NULLPTR); + explicit QTapGesture(QObject *parent = nullptr); ~QTapGesture(); QPointF position() const; @@ -257,7 +257,7 @@ class Q_WIDGETS_EXPORT QTapAndHoldGesture : public QGesture Q_PROPERTY(QPointF position READ position WRITE setPosition) public: - explicit QTapAndHoldGesture(QObject *parent = Q_NULLPTR); + explicit QTapAndHoldGesture(QObject *parent = nullptr); ~QTapAndHoldGesture(); QPointF position() const; diff --git a/src/widgets/kernel/qgesturemanager.cpp b/src/widgets/kernel/qgesturemanager.cpp index f27961b817..5bf66d68e3 100644 --- a/src/widgets/kernel/qgesturemanager.cpp +++ b/src/widgets/kernel/qgesturemanager.cpp @@ -124,7 +124,7 @@ QGestureManager::~QGestureManager() Qt::GestureType QGestureManager::registerGestureRecognizer(QGestureRecognizer *recognizer) { - QGesture *dummy = recognizer->create(0); + const QScopedPointer<QGesture> dummy(recognizer->create(nullptr)); if (Q_UNLIKELY(!dummy)) { qWarning("QGestureManager::registerGestureRecognizer: " "the recognizer fails to create a gesture object, skipping registration."); @@ -137,7 +137,6 @@ Qt::GestureType QGestureManager::registerGestureRecognizer(QGestureRecognizer *r type = Qt::GestureType(m_lastCustomGestureId); } m_recognizers.insertMulti(type, recognizer); - delete dummy; return type; } @@ -145,10 +144,9 @@ void QGestureManager::unregisterGestureRecognizer(Qt::GestureType type) { QList<QGestureRecognizer *> list = m_recognizers.values(type); while (QGestureRecognizer *recognizer = m_recognizers.take(type)) { - if (!m_obsoleteGestures.contains(recognizer)) { - // inserting even an empty QSet will cause the recognizer to be deleted on destruction of the manager - m_obsoleteGestures.insert(recognizer, QSet<QGesture *>()); - } + // ensuring an entry exists causes the recognizer to be deleted on destruction of the manager + auto &gestures = m_obsoleteGestures[recognizer]; + Q_UNUSED(gestures); } foreach (QGesture *g, m_gestureToRecognizer.keys()) { QGestureRecognizer *recognizer = m_gestureToRecognizer.value(g); diff --git a/src/widgets/kernel/qgesturerecognizer.cpp b/src/widgets/kernel/qgesturerecognizer.cpp index e7873d455e..65c46a5e56 100644 --- a/src/widgets/kernel/qgesturerecognizer.cpp +++ b/src/widgets/kernel/qgesturerecognizer.cpp @@ -193,7 +193,7 @@ void QGestureRecognizer::reset(QGesture *gesture) } /*! - \fn QGestureRecognizer::recognize(QGesture *gesture, QObject *watched, QEvent *event) + \fn QGestureRecognizer::Result QGestureRecognizer::recognize(QGesture *gesture, QObject *watched, QEvent *event) Handles the given \a event for the \a watched object, updating the state of the \a gesture object as required, and returns a suitable result for the current recognition step. diff --git a/src/widgets/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp index 29df38f19c..db8ef89477 100644 --- a/src/widgets/kernel/qgridlayout.cpp +++ b/src/widgets/kernel/qgridlayout.cpp @@ -170,7 +170,7 @@ public: } return 0; } - QLayoutItem* replaceAt(int index, QLayoutItem *newitem) Q_DECL_OVERRIDE + QLayoutItem* replaceAt(int index, QLayoutItem *newitem) override { if (!newitem) return 0; diff --git a/src/widgets/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h index 51dd65d181..0283ec2028 100644 --- a/src/widgets/kernel/qgridlayout.h +++ b/src/widgets/kernel/qgridlayout.h @@ -66,9 +66,9 @@ public: ~QGridLayout(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSize() const override; + QSize maximumSize() const override; void setHorizontalSpacing(int spacing); int horizontalSpacing() const; @@ -92,12 +92,12 @@ public: QRect cellRect(int row, int column) const; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int) const Q_DECL_OVERRIDE; - int minimumHeightForWidth(int) const Q_DECL_OVERRIDE; + bool hasHeightForWidth() const override; + int heightForWidth(int) const override; + int minimumHeightForWidth(int) const override; - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - void invalidate() Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; + void invalidate() override; inline void addWidget(QWidget *w) { QLayout::addWidget(w); } void addWidget(QWidget *, int row, int column, Qt::Alignment = Qt::Alignment()); @@ -108,11 +108,11 @@ public: void setOriginCorner(Qt::Corner); Qt::Corner originCorner() const; - QLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; + QLayoutItem *itemAt(int index) const override; QLayoutItem *itemAtPosition(int row, int column) const; - QLayoutItem *takeAt(int index) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; - void setGeometry(const QRect&) Q_DECL_OVERRIDE; + QLayoutItem *takeAt(int index) override; + int count() const override; + void setGeometry(const QRect&) override; void addItem(QLayoutItem *item, int row, int column, int rowSpan = 1, int columnSpan = 1, Qt::Alignment = Qt::Alignment()); @@ -120,7 +120,7 @@ public: void getItemPosition(int idx, int *row, int *column, int *rowSpan, int *columnSpan) const; protected: - void addItem(QLayoutItem *) Q_DECL_OVERRIDE; + void addItem(QLayoutItem *) override; private: Q_DISABLE_COPY(QGridLayout) diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index 2de12b4f99..bcc33a0811 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -104,8 +104,8 @@ public: QWidget *parentWidget() const; - void invalidate() Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE; + void invalidate() override; + QRect geometry() const override; bool activate(); void update(); @@ -115,25 +115,25 @@ public: void removeWidget(QWidget *w); void removeItem(QLayoutItem *); - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; - virtual void setGeometry(const QRect&) Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; + QSize minimumSize() const override; + QSize maximumSize() const override; + virtual void setGeometry(const QRect&) override; virtual QLayoutItem *itemAt(int index) const = 0; virtual QLayoutItem *takeAt(int index) = 0; virtual int indexOf(QWidget *) const; virtual int count() const = 0; - bool isEmpty() const Q_DECL_OVERRIDE; - QSizePolicy::ControlTypes controlTypes() const Q_DECL_OVERRIDE; + bool isEmpty() const override; + QSizePolicy::ControlTypes controlTypes() const override; - // ### Qt 6 make this function virtual - QLayoutItem *replaceWidget(QWidget *from, QWidget *to, Qt::FindChildOptions options = Qt::FindChildrenRecursively); + QT6_VIRTUAL QLayoutItem *replaceWidget(QWidget *from, QWidget *to, + Qt::FindChildOptions options = Qt::FindChildrenRecursively); int totalHeightForWidth(int w) const; QSize totalMinimumSize() const; QSize totalMaximumSize() const; QSize totalSizeHint() const; - QLayout *layout() Q_DECL_OVERRIDE; + QLayout *layout() override; void setEnabled(bool); bool isEnabled() const; @@ -143,7 +143,7 @@ public: protected: void widgetEvent(QEvent *); - void childEvent(QChildEvent *e) Q_DECL_OVERRIDE; + void childEvent(QChildEvent *e) override; void addChildLayout(QLayout *l); void addChildWidget(QWidget *w); bool adoptLayout(QLayout *layout); diff --git a/src/widgets/kernel/qlayoutitem.cpp b/src/widgets/kernel/qlayoutitem.cpp index 0bdac43c56..5c4fc20687 100644 --- a/src/widgets/kernel/qlayoutitem.cpp +++ b/src/widgets/kernel/qlayoutitem.cpp @@ -400,8 +400,8 @@ int QLayoutItem::minimumHeightForWidth(int w) const /*! - Returns the preferred height for this layout item, given the width - \a w. + Returns the preferred height for this layout item, given the + width, which is not used in this default implementation. The default implementation returns -1, indicating that the preferred height is independent of the width of the item. Using diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp index 218d3c4a46..c96b6812c4 100644 --- a/src/widgets/kernel/qopenglwidget.cpp +++ b/src/widgets/kernel/qopenglwidget.cpp @@ -381,7 +381,7 @@ QT_BEGIN_NAMESPACE QOpenGLContext. By connecting a slot, using direct connection, to this signal, it is possible to perform cleanup whenever the the underlying native context handle, or the entire QOpenGLContext instance, is going to be released. The - following snippet is in principal equivalent to the previous one: + following snippet is in principle equivalent to the previous one: \snippet code/doc_gui_widgets_qopenglwidget.cpp 5 @@ -536,8 +536,8 @@ public: : QOpenGLPaintDevicePrivate(QSize()), w(widget) { } - void beginPaint() Q_DECL_OVERRIDE; - void endPaint() Q_DECL_OVERRIDE; + void beginPaint() override; + void endPaint() override; QOpenGLWidget *w; }; @@ -547,7 +547,7 @@ class QOpenGLWidgetPaintDevice : public QOpenGLPaintDevice public: QOpenGLWidgetPaintDevice(QOpenGLWidget *widget) : QOpenGLPaintDevice(*new QOpenGLWidgetPaintDevicePrivate(widget)) { } - void ensureActiveTarget() Q_DECL_OVERRIDE; + void ensureActiveTarget() override; }; class QOpenGLWidgetPrivate : public QWidgetPrivate @@ -567,7 +567,8 @@ public: paintDevice(0), updateBehavior(QOpenGLWidget::NoPartialUpdate), requestedSamples(0), - inPaintGL(false) + inPaintGL(false), + textureFormat(0) { requestedFormat = QSurfaceFormat::defaultFormat(); } @@ -575,7 +576,8 @@ public: void reset(); void recreateFbo(); - GLuint textureId() const Q_DECL_OVERRIDE; + GLuint textureId() const override; + QPlatformTextureList::Flags textureListFlags() override; void initialize(); void invokeUserPaint(); @@ -583,14 +585,14 @@ public: void invalidateFbo(); - QImage grabFramebuffer() Q_DECL_OVERRIDE; - void beginBackingStorePainting() Q_DECL_OVERRIDE { inBackingStorePaint = true; } - void endBackingStorePainting() Q_DECL_OVERRIDE { inBackingStorePaint = false; } - void beginCompose() Q_DECL_OVERRIDE; - void endCompose() Q_DECL_OVERRIDE; - void initializeViewportFramebuffer() Q_DECL_OVERRIDE; - void resizeViewportFramebuffer() Q_DECL_OVERRIDE; - void resolveSamples() Q_DECL_OVERRIDE; + QImage grabFramebuffer() override; + void beginBackingStorePainting() override { inBackingStorePaint = true; } + void endBackingStorePainting() override { inBackingStorePaint = false; } + void beginCompose() override; + void endCompose() override; + void initializeViewportFramebuffer() override; + void resizeViewportFramebuffer() override; + void resolveSamples() override; QOpenGLContext *context; QOpenGLFramebufferObject *fbo; @@ -606,6 +608,7 @@ public: QOpenGLWidget::UpdateBehavior updateBehavior; int requestedSamples; bool inPaintGL; + GLenum textureFormat; }; void QOpenGLWidgetPaintDevicePrivate::beginPaint() @@ -663,6 +666,35 @@ GLuint QOpenGLWidgetPrivate::textureId() const return resolvedFbo ? resolvedFbo->texture() : (fbo ? fbo->texture() : 0); } +#ifndef GL_SRGB +#define GL_SRGB 0x8C40 +#endif +#ifndef GL_SRGB8 +#define GL_SRGB8 0x8C41 +#endif +#ifndef GL_SRGB_ALPHA +#define GL_SRGB_ALPHA 0x8C42 +#endif +#ifndef GL_SRGB8_ALPHA8 +#define GL_SRGB8_ALPHA8 0x8C43 +#endif + +QPlatformTextureList::Flags QOpenGLWidgetPrivate::textureListFlags() +{ + QPlatformTextureList::Flags flags = QWidgetPrivate::textureListFlags(); + switch (textureFormat) { + case GL_SRGB: + case GL_SRGB8: + case GL_SRGB_ALPHA: + case GL_SRGB8_ALPHA8: + flags |= QPlatformTextureList::TextureIsSrgb; + break; + default: + break; + } + return flags; +} + void QOpenGLWidgetPrivate::reset() { Q_Q(QOpenGLWidget); @@ -712,12 +744,16 @@ void QOpenGLWidgetPrivate::recreateFbo() QOpenGLFramebufferObjectFormat format; format.setAttachment(QOpenGLFramebufferObject::CombinedDepthStencil); format.setSamples(samples); + if (textureFormat) + format.setInternalTextureFormat(textureFormat); const QSize deviceSize = q->size() * q->devicePixelRatioF(); fbo = new QOpenGLFramebufferObject(deviceSize, format); if (samples > 0) resolvedFbo = new QOpenGLFramebufferObject(deviceSize); + textureFormat = fbo->format().internalTextureFormat(); + fbo->bind(); context->functions()->glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT); @@ -755,10 +791,8 @@ void QOpenGLWidgetPrivate::initialize() // texture usable by the underlying window's backingstore. QWidget *tlw = q->window(); QOpenGLContext *shareContext = get(tlw)->shareContext(); - if (Q_UNLIKELY(!shareContext)) { - qWarning("QOpenGLWidget: Cannot be used without a context shared with the toplevel."); - return; - } + // If shareContext is null, showing content on-screen will not work. + // However, offscreen rendering and grabFramebuffer() will stay fully functional. // Do not include the sample count. Requesting a multisampled context is not necessary // since we render into an FBO, never to an actual surface. What's more, attempting to @@ -768,25 +802,31 @@ void QOpenGLWidgetPrivate::initialize() requestedFormat.setSamples(0); QScopedPointer<QOpenGLContext> ctx(new QOpenGLContext); - ctx->setShareContext(shareContext); ctx->setFormat(requestedFormat); - ctx->setScreen(shareContext->screen()); + if (shareContext) { + ctx->setShareContext(shareContext); + ctx->setScreen(shareContext->screen()); + } if (Q_UNLIKELY(!ctx->create())) { qWarning("QOpenGLWidget: Failed to create context"); return; } - // Propagate settings that make sense only for the tlw. - QSurfaceFormat tlwFormat = tlw->windowHandle()->format(); - if (requestedFormat.swapInterval() != tlwFormat.swapInterval()) { - // Most platforms will pick up the changed swap interval on the next - // makeCurrent or swapBuffers. - tlwFormat.setSwapInterval(requestedFormat.swapInterval()); - tlw->windowHandle()->setFormat(tlwFormat); - } - if (requestedFormat.swapBehavior() != tlwFormat.swapBehavior()) { - tlwFormat.setSwapBehavior(requestedFormat.swapBehavior()); - tlw->windowHandle()->setFormat(tlwFormat); + // Propagate settings that make sense only for the tlw. Note that this only + // makes sense for properties that get picked up even after the native + // window is created. + if (tlw->windowHandle()) { + QSurfaceFormat tlwFormat = tlw->windowHandle()->format(); + if (requestedFormat.swapInterval() != tlwFormat.swapInterval()) { + // Most platforms will pick up the changed swap interval on the next + // makeCurrent or swapBuffers. + tlwFormat.setSwapInterval(requestedFormat.swapInterval()); + tlw->windowHandle()->setFormat(tlwFormat); + } + if (requestedFormat.swapBehavior() != tlwFormat.swapBehavior()) { + tlwFormat.setSwapBehavior(requestedFormat.swapBehavior()); + tlw->windowHandle()->setFormat(tlwFormat); + } } // The top-level window's surface is not good enough since it causes way too @@ -880,9 +920,14 @@ extern Q_GUI_EXPORT QImage qt_gl_read_framebuffer(const QSize &size, bool alpha_ QImage QOpenGLWidgetPrivate::grabFramebuffer() { Q_Q(QOpenGLWidget); + + initialize(); if (!initialized) return QImage(); + if (!fbo) // could be completely offscreen, without ever getting a resize event + recreateFbo(); + if (!inPaintGL) render(); @@ -1000,7 +1045,6 @@ QOpenGLWidget::UpdateBehavior QOpenGLWidget::updateBehavior() const */ void QOpenGLWidget::setFormat(const QSurfaceFormat &format) { - Q_UNUSED(format); Q_D(QOpenGLWidget); if (Q_UNLIKELY(d->initialized)) { qWarning("QOpenGLWidget: Already initialized, setting the format has no effect"); @@ -1033,6 +1077,47 @@ QSurfaceFormat QOpenGLWidget::format() const } /*! + Sets a custom internal texture format of \a texFormat. + + When working with sRGB framebuffers, it will be necessary to specify a + format like \c{GL_SRGB8_ALPHA8}. This can be achieved by calling this + function. + + \note This function has no effect if called after the widget has already + been shown and thus it performed initialization. + + \note This function will typically have to be used in combination with a + QSurfaceFormat::setDefaultFormat() call that sets the color space to + QSurfaceFormat::sRGBColorSpace. + + \since 5.10 + */ +void QOpenGLWidget::setTextureFormat(GLenum texFormat) +{ + Q_D(QOpenGLWidget); + if (Q_UNLIKELY(d->initialized)) { + qWarning("QOpenGLWidget: Already initialized, setting the internal texture format has no effect"); + return; + } + + d->textureFormat = texFormat; +} + +/*! + \return the active internal texture format if the widget has already + initialized, the requested format if one was set but the widget has not yet + been made visible, or 0 if setTextureFormat() was not called and the widget + has not yet been made visible. + + \since 5.10 + */ +GLenum QOpenGLWidget::textureFormat() const +{ + Q_D(const QOpenGLWidget); + return d->textureFormat; +} + +/*! \return \e true if the widget and OpenGL resources, like the context, have been successfully initialized. Note that the return value is always false until the widget is shown. @@ -1293,7 +1378,7 @@ int QOpenGLWidget::metric(QPaintDevice::PaintDeviceMetric metric) const if (window) return int(window->devicePixelRatio() * devicePixelRatioFScale()); else - return 1.0; + return int(devicePixelRatioFScale()); default: qWarning("QOpenGLWidget::metric(): unknown metric %d", metric); return 0; @@ -1344,9 +1429,16 @@ bool QOpenGLWidget::event(QEvent *e) d->reset(); if (isHidden()) break; - // FALLTHROUGH + Q_FALLTHROUGH(); case QEvent::Show: // reparenting may not lead to a resize so reinitalize on Show too - if (!d->initialized && !size().isEmpty() && window() && window()->windowHandle()) { + if (d->initialized && window()->windowHandle() + && d->context->shareContext() != QWidgetPrivate::get(window())->shareContext()) + { + // Special case: did grabFramebuffer() for a hidden widget that then became visible. + // Recreate all resources since the context now needs to share with the TLW's. + d->reset(); + } + if (!d->initialized && !size().isEmpty() && window()->windowHandle()) { d->initialize(); if (d->initialized) d->recreateFbo(); diff --git a/src/widgets/kernel/qopenglwidget.h b/src/widgets/kernel/qopenglwidget.h index b60d79bedb..9eb4a9ba5a 100644 --- a/src/widgets/kernel/qopenglwidget.h +++ b/src/widgets/kernel/qopenglwidget.h @@ -63,7 +63,7 @@ public: PartialUpdate }; - explicit QOpenGLWidget(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); + explicit QOpenGLWidget(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); ~QOpenGLWidget(); void setUpdateBehavior(UpdateBehavior updateBehavior); @@ -72,6 +72,9 @@ public: void setFormat(const QSurfaceFormat &format); QSurfaceFormat format() const; + GLenum textureFormat() const; + void setTextureFormat(GLenum texFormat); + bool isValid() const; void makeCurrent(); @@ -93,13 +96,13 @@ protected: virtual void resizeGL(int w, int h); virtual void paintGL(); - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; - bool event(QEvent *e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + bool event(QEvent *e) override; - int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE; - QPaintDevice *redirected(QPoint *p) const Q_DECL_OVERRIDE; - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + int metric(QPaintDevice::PaintDeviceMetric metric) const override; + QPaintDevice *redirected(QPoint *p) const override; + QPaintEngine *paintEngine() const override; private: Q_DISABLE_COPY(QOpenGLWidget) diff --git a/src/widgets/kernel/qshortcut.h b/src/widgets/kernel/qshortcut.h index 22c667c9c1..6dcf4971b2 100644 --- a/src/widgets/kernel/qshortcut.h +++ b/src/widgets/kernel/qshortcut.h @@ -62,7 +62,7 @@ class Q_WIDGETS_EXPORT QShortcut : public QObject public: explicit QShortcut(QWidget *parent); QShortcut(const QKeySequence& key, QWidget *parent, - const char *member = Q_NULLPTR, const char *ambiguousMember = Q_NULLPTR, + const char *member = nullptr, const char *ambiguousMember = nullptr, Qt::ShortcutContext context = Qt::WindowShortcut); ~QShortcut(); @@ -91,7 +91,7 @@ Q_SIGNALS: void activatedAmbiguously(); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; }; #endif // QT_NO_SHORTCUT diff --git a/src/widgets/kernel/qstackedlayout.cpp b/src/widgets/kernel/qstackedlayout.cpp index b8b6f4302d..7430d833db 100644 --- a/src/widgets/kernel/qstackedlayout.cpp +++ b/src/widgets/kernel/qstackedlayout.cpp @@ -51,7 +51,7 @@ class QStackedLayoutPrivate : public QLayoutPrivate Q_DECLARE_PUBLIC(QStackedLayout) public: QStackedLayoutPrivate() : index(-1), stackingMode(QStackedLayout::StackOne) {} - QLayoutItem* replaceAt(int index, QLayoutItem *newitem) Q_DECL_OVERRIDE; + QLayoutItem* replaceAt(int index, QLayoutItem *newitem) override; QList<QLayoutItem *> list; int index; QStackedLayout::StackingMode stackingMode; diff --git a/src/widgets/kernel/qstackedlayout.h b/src/widgets/kernel/qstackedlayout.h index 6f5eded1f0..966ee2aae4 100644 --- a/src/widgets/kernel/qstackedlayout.h +++ b/src/widgets/kernel/qstackedlayout.h @@ -75,20 +75,20 @@ public: int currentIndex() const; using QLayout::widget; QWidget *widget(int) const; - int count() const Q_DECL_OVERRIDE; + int count() const override; StackingMode stackingMode() const; void setStackingMode(StackingMode stackingMode); // abstract virtual functions: - void addItem(QLayoutItem *item) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int) Q_DECL_OVERRIDE; - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int width) const Q_DECL_OVERRIDE; + void addItem(QLayoutItem *item) override; + QSize sizeHint() const override; + QSize minimumSize() const override; + QLayoutItem *itemAt(int) const override; + QLayoutItem *takeAt(int) override; + void setGeometry(const QRect &rect) override; + bool hasHeightForWidth() const override; + int heightForWidth(int width) const override; Q_SIGNALS: void widgetRemoved(int index); diff --git a/src/widgets/kernel/qstandardgestures_p.h b/src/widgets/kernel/qstandardgestures_p.h index 9b2cffaa9a..6de09361fe 100644 --- a/src/widgets/kernel/qstandardgestures_p.h +++ b/src/widgets/kernel/qstandardgestures_p.h @@ -64,9 +64,9 @@ class QPanGestureRecognizer : public QGestureRecognizer public: explicit QPanGestureRecognizer(int pointCount = 2) : m_pointCount(pointCount) {} - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; private: const int m_pointCount; @@ -77,9 +77,9 @@ class QPinchGestureRecognizer : public QGestureRecognizer public: QPinchGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; class QSwipeGestureRecognizer : public QGestureRecognizer @@ -87,9 +87,9 @@ class QSwipeGestureRecognizer : public QGestureRecognizer public: QSwipeGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; class QTapGestureRecognizer : public QGestureRecognizer @@ -97,9 +97,9 @@ class QTapGestureRecognizer : public QGestureRecognizer public: QTapGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; class QTapAndHoldGestureRecognizer : public QGestureRecognizer @@ -107,9 +107,9 @@ class QTapAndHoldGestureRecognizer : public QGestureRecognizer public: QTapAndHoldGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; QT_END_NAMESPACE diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp index c2610131f3..69b62ff7d7 100644 --- a/src/widgets/kernel/qtooltip.cpp +++ b/src/widgets/kernel/qtooltip.cpp @@ -44,6 +44,7 @@ #include <qapplication.h> #include <qdesktopwidget.h> +#include <private/qdesktopwidget_p.h> #include <qevent.h> #include <qpointer.h> #include <qstyle.h> @@ -126,7 +127,7 @@ public: ~QTipLabel(); static QTipLabel *instance; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; QBasicTimer hideTimer, expireTimer; @@ -142,10 +143,10 @@ public: static int getTipScreen(const QPoint &pos, QWidget *w); protected: - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *e) override; + void paintEvent(QPaintEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void resizeEvent(QResizeEvent *e) override; #ifndef QT_NO_STYLE_STYLESHEET public slots: @@ -366,10 +367,10 @@ bool QTipLabel::eventFilter(QObject *o, QEvent *e) int QTipLabel::getTipScreen(const QPoint &pos, QWidget *w) { - if (QApplication::desktop()->isVirtualDesktop()) - return QApplication::desktop()->screenNumber(pos); + if (QDesktopWidgetPrivate::isVirtualDesktop()) + return QDesktopWidgetPrivate::screenNumber(pos); else - return QApplication::desktop()->screenNumber(w); + return QDesktopWidgetPrivate::screenNumber(w); } void QTipLabel::placeTip(const QPoint &pos, QWidget *w) @@ -399,11 +400,11 @@ void QTipLabel::placeTip(const QPoint &pos, QWidget *w) extern bool qt_mac_app_fullscreen; //qapplication_mac.mm QRect screen; if(qt_mac_app_fullscreen) - screen = QApplication::desktop()->screenGeometry(getTipScreen(pos, w)); + screen = QDesktopWidgetPrivate::screenGeometry(getTipScreen(pos, w)); else - screen = QApplication::desktop()->availableGeometry(getTipScreen(pos, w)); + screen = QDesktopWidgetPrivate::availableGeometry(getTipScreen(pos, w)); #else - QRect screen = QApplication::desktop()->screenGeometry(getTipScreen(pos, w)); + QRect screen = QDesktopWidgetPrivate::screenGeometry(getTipScreen(pos, w)); #endif QPoint p = pos; @@ -500,7 +501,10 @@ void QToolTip::showText(const QPoint &pos, const QString &text, QWidget *w, cons #ifdef Q_OS_WIN32 // On windows, we can't use the widget as parent otherwise the window will be // raised when the tooltip will be shown +QT_WARNING_PUSH +QT_WARNING_DISABLE_DEPRECATED new QTipLabel(text, QApplication::desktop()->screen(QTipLabel::getTipScreen(pos, w)), msecDisplayTime); +QT_WARNING_POP #else new QTipLabel(text, w, msecDisplayTime); // sets QTipLabel::instance to itself #endif diff --git a/src/widgets/kernel/qtooltip.h b/src/widgets/kernel/qtooltip.h index 5e68eef0a7..edf1de0c1d 100644 --- a/src/widgets/kernel/qtooltip.h +++ b/src/widgets/kernel/qtooltip.h @@ -53,7 +53,7 @@ class Q_WIDGETS_EXPORT QToolTip QToolTip() Q_DECL_EQ_DELETE; public: // ### Qt 6 - merge the three showText functions below - static void showText(const QPoint &pos, const QString &text, QWidget *w = Q_NULLPTR); + static void showText(const QPoint &pos, const QString &text, QWidget *w = nullptr); static void showText(const QPoint &pos, const QString &text, QWidget *w, const QRect &rect); static void showText(const QPoint &pos, const QString &text, QWidget *w, const QRect &rect, int msecShowTime); static inline void hideText() { showText(QPoint(), QString()); } diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index e2cfebb8a1..96d0cf61c4 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -42,6 +42,7 @@ #include "qapplication.h" #include <private/qguiapplication_p.h> #include "qdesktopwidget.h" +#include <private/qdesktopwidget_p.h> #include "qevent.h" #include "qpixmap.h" #include "qscreen.h" @@ -144,12 +145,12 @@ public: static QWhatsThat *instance; protected: - void showEvent(QShowEvent *e) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *e) override; + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void keyPressEvent(QKeyEvent*) override; + void paintEvent(QPaintEvent*) override; private: QPointer<QWidget>widget; @@ -209,7 +210,7 @@ QWhatsThat::QWhatsThat(const QString& txt, QWidget* parent, QWidget *showTextFor } else { - int sw = QApplication::desktop()->width() / 3; + int sw = QDesktopWidgetPrivate::width() / 3; if (sw < 200) sw = 200; else if (sw > 300) @@ -364,7 +365,7 @@ class QWhatsThisPrivate : public QObject QWhatsThisPrivate(); ~QWhatsThisPrivate(); static QWhatsThisPrivate *instance; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; QPointer<QAction> action; static void say(QWidget *, const QString &, int x = 0, int y = 0); static void notifyToplevels(QEvent *e); @@ -582,14 +583,14 @@ void QWhatsThisPrivate::say(QWidget * widget, const QString &text, int x, int y) // okay, now to find a suitable location int scr = (widget ? - QApplication::desktop()->screenNumber(widget) : + QDesktopWidgetPrivate::screenNumber(widget) : #if 0 /* Used to be included in Qt4 for Q_WS_X11 */ && !defined(QT_NO_CURSOR) QCursor::x11Screen() #else - QApplication::desktop()->screenNumber(QPoint(x,y)) + QDesktopWidgetPrivate::screenNumber(QPoint(x,y)) #endif ); - QRect screen = QApplication::desktop()->screenGeometry(scr); + QRect screen = QDesktopWidgetPrivate::screenGeometry(scr); int w = whatsThat->width(); int h = whatsThat->height(); diff --git a/src/widgets/kernel/qwhatsthis.h b/src/widgets/kernel/qwhatsthis.h index 3211796d3e..1f0f82b2a2 100644 --- a/src/widgets/kernel/qwhatsthis.h +++ b/src/widgets/kernel/qwhatsthis.h @@ -59,10 +59,10 @@ public: static bool inWhatsThisMode(); static void leaveWhatsThisMode(); - static void showText(const QPoint &pos, const QString &text, QWidget *w = Q_NULLPTR); + static void showText(const QPoint &pos, const QString &text, QWidget *w = nullptr); static void hideText(); - static QAction *createAction(QObject *parent = Q_NULLPTR); + static QAction *createAction(QObject *parent = nullptr); }; diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 1fea3836ec..74f2dc0c41 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2016 The Qt Company Ltd. +** Copyright (C) 2017 The Qt Company Ltd. ** Copyright (C) 2016 Intel Corporation. ** Contact: https://www.qt.io/licensing/ ** @@ -69,7 +69,6 @@ # include <private/qmainwindowlayout_p.h> #endif #include <qpa/qplatformwindow.h> -#include <qpa/qplatformbackingstore.h> #include "private/qwidgetwindow_p.h" #include "qpainter.h" #include "qtooltip.h" @@ -1106,9 +1105,12 @@ void QWidgetPrivate::adjustFlags(Qt::WindowFlags &flags, QWidget *w) } if (customize) ; // don't modify window flags if the user explicitly set them. - else if (type == Qt::Dialog || type == Qt::Sheet) - flags |= Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowContextHelpButtonHint | Qt::WindowCloseButtonHint; - else if (type == Qt::Tool) + else if (type == Qt::Dialog || type == Qt::Sheet) { + flags |= Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint; + // ### fixme: Qt 6: Never set Qt::WindowContextHelpButtonHint flag automatically + if (!QApplicationPrivate::testAttribute(Qt::AA_DisableWindowContextHelpButton)) + flags |= Qt::WindowContextHelpButtonHint; + } else if (type == Qt::Tool) flags |= Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint; else flags |= Qt::WindowTitleHint | Qt::WindowSystemMenuHint | Qt::WindowMinimizeButtonHint | @@ -1153,7 +1155,7 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f) if (targetScreen >= 0) { topData()->initialScreenIndex = targetScreen; if (QWindow *window = q->windowHandle()) - window->setScreen(QGuiApplication::screens().value(targetScreen, Q_NULLPTR)); + window->setScreen(QGuiApplication::screens().value(targetScreen, nullptr)); } data.fstrut_dirty = true; @@ -1412,7 +1414,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO if (!q->testAttribute(Qt::WA_NativeWindow) && !q->isWindow()) return; // we only care about real toplevels - QWindow *win = topData()->window; + QWidgetWindow *win = topData()->window; // topData() ensures the extra is created but does not ensure 'window' is non-null // in case the extra was already valid. if (!win) { @@ -1436,7 +1438,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO if (q->testAttribute(Qt::WA_ShowWithoutActivating)) win->setProperty("_q_showWithoutActivating", QVariant(true)); if (q->testAttribute(Qt::WA_MacAlwaysShowToolWindow)) - win->setProperty("_q_macAlwaysShowToolWindow", QVariant::fromValue(QVariant(true))); + win->setProperty("_q_macAlwaysShowToolWindow", QVariant(true)); setNetWmWindowTypes(true); // do nothing if none of WA_X11NetWmWindowType* is set win->setFlags(flags); fixPosIncludesFrame(); @@ -1450,9 +1452,9 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO topData()->initialScreenIndex = -1; if (screenNumber < 0) { screenNumber = q->windowType() != Qt::Desktop - ? QApplication::desktop()->screenNumber(q) : 0; + ? QDesktopWidgetPrivate::screenNumber(q) : 0; } - win->setScreen(QGuiApplication::screens().value(screenNumber, Q_NULLPTR)); + win->setScreen(QGuiApplication::screens().value(screenNumber, nullptr)); } QSurfaceFormat format = win->requestedFormat(); @@ -1494,7 +1496,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO QBackingStore *store = q->backingStore(); if (!store) { - if (win && q->windowType() != Qt::Desktop) { + if (q->windowType() != Qt::Desktop) { if (q->isTopLevel()) q->setBackingStore(new QBackingStore(win)); } else { @@ -1521,7 +1523,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO q->setAttribute(Qt::WA_OutsideWSRange, true); } else if (q->isVisible()) { // If widget is already shown, set window visible, too - win->setVisible(true); + win->setNativeWindowVisibility(true); } } @@ -1868,39 +1870,15 @@ static void deleteBackingStore(QWidgetPrivate *d) { QTLWExtra *topData = d->topData(); - // The context must be current when destroying the backing store as it may attempt to - // release resources like textures and shader programs. The window may not be suitable - // anymore as there will often not be a platform window underneath at this stage. Fall - // back to a QOffscreenSurface in this case. - QScopedPointer<QOffscreenSurface> tempSurface; -#ifndef QT_NO_OPENGL - if (d->textureChildSeen && topData->shareContext) { - if (topData->window->handle()) { - topData->shareContext->makeCurrent(topData->window); - } else { - tempSurface.reset(new QOffscreenSurface); - tempSurface->setFormat(topData->shareContext->format()); - tempSurface->create(); - topData->shareContext->makeCurrent(tempSurface.data()); - } - } -#endif - delete topData->backingStore; topData->backingStore = 0; - -#ifndef QT_NO_OPENGL - if (d->textureChildSeen && topData->shareContext) - topData->shareContext->doneCurrent(); -#endif } void QWidgetPrivate::deleteTLSysExtra() { if (extra && extra->topextra) { //the qplatformbackingstore may hold a reference to the window, so the backingstore - //needs to be deleted first. If the backingstore holds GL resources, we need to - // make the context current here. This is taken care of by deleteBackingStore(). + //needs to be deleted first. extra->topextra->backingStoreTracker.destroy(); deleteBackingStore(this); @@ -2107,14 +2085,15 @@ QRegion QWidgetPrivate::clipRegion() const return r; } -void QWidgetPrivate::setSystemClip(QPaintDevice *paintDevice, const QRegion ®ion) +void QWidgetPrivate::setSystemClip(QPaintEngine *paintEngine, qreal devicePixelRatio, const QRegion ®ion) { // Transform the system clip region from device-independent pixels to device pixels - QPaintEngine *paintEngine = paintDevice->paintEngine(); QTransform scaleTransform; - const qreal devicePixelRatio = paintDevice->devicePixelRatioF(); scaleTransform.scale(devicePixelRatio, devicePixelRatio); - paintEngine->d_func()->systemClip = scaleTransform.map(region); + + paintEngine->d_func()->baseSystemClip = region; + paintEngine->d_func()->setSystemTransform(scaleTransform); + } #if QT_CONFIG(graphicseffect) @@ -2643,11 +2622,7 @@ WId QWidget::effectiveWinId() const QWindow *QWidget::windowHandle() const { Q_D(const QWidget); - QTLWExtra *extra = d->maybeTopData(); - if (extra) - return extra->window; - - return 0; + return d->windowHandle(); } #ifndef QT_NO_STYLE_STYLESHEET @@ -3042,17 +3017,6 @@ void QWidget::overrideWindowState(Qt::WindowStates newstate) QApplication::sendEvent(this, &e); } -Qt::WindowState effectiveState(Qt::WindowStates state) -{ - if (state & Qt::WindowMinimized) - return Qt::WindowMinimized; - else if (state & Qt::WindowFullScreen) - return Qt::WindowFullScreen; - else if (state & Qt::WindowMaximized) - return Qt::WindowMaximized; - return Qt::WindowNoState; -} - /*! \fn void QWidget::setWindowState(Qt::WindowStates windowState) @@ -3094,19 +3058,17 @@ void QWidget::setWindowState(Qt::WindowStates newstate) data->window_state = newstate; data->in_set_window_state = 1; - Qt::WindowState newEffectiveState = effectiveState(newstate); - Qt::WindowState oldEffectiveState = effectiveState(oldstate); - if (isWindow() && newEffectiveState != oldEffectiveState) { + if (isWindow()) { // Ensure the initial size is valid, since we store it as normalGeometry below. if (!testAttribute(Qt::WA_Resized) && !isVisible()) adjustSize(); d->createTLExtra(); - if (oldEffectiveState == Qt::WindowNoState) + if (!(oldstate & (Qt::WindowMinimized | Qt::WindowMaximized | Qt::WindowFullScreen))) d->topData()->normalGeometry = geometry(); Q_ASSERT(windowHandle()); - windowHandle()->setWindowState(newEffectiveState); + windowHandle()->setWindowStates(newstate & ~Qt::WindowActive); } data->in_set_window_state = 0; @@ -4527,7 +4489,7 @@ void QWidget::setForegroundRole(QPalette::ColorRole role) The default depends on the system environment. QApplication maintains a system/theme palette which serves as a default for all widgets. There may also be special palette defaults for certain types of widgets (e.g., on - Windows XP and Vista, all classes that derive from QMenuBar have a special + Windows Vista, all classes that derive from QMenuBar have a special default palette). You can also define default palettes for widgets yourself by passing a custom palette and the name of a widget to QApplication::setPalette(). Finally, the style always has the option of @@ -4545,8 +4507,8 @@ void QWidget::setForegroundRole(QPalette::ColorRole role) The current style, which is used to render the content of all standard Qt widgets, is free to choose colors and brushes from the widget palette, or in some cases, to ignore the palette (partially, or completely). In - particular, certain styles like GTK style, Mac style, Windows XP, and - Vista style, depend on third party APIs to render the content of widgets, + particular, certain styles like GTK style, Mac style, and Windows Vista + style, depend on third party APIs to render the content of widgets, and these styles typically do not follow the palette. Because of this, assigning roles to a widget's palette is not guaranteed to change the appearance of the widget. Instead, you may choose to apply a \l @@ -4708,7 +4670,7 @@ void QWidgetPrivate::updateSystemBackground() The current style, which is used to render the content of all standard Qt widgets, is free to choose to use the widget font, or in some cases, to ignore it (partially, or completely). In particular, certain styles like - GTK style, Mac style, Windows XP, and Vista style, apply special + GTK style, Mac style, and Windows Vista style, apply special modifications to the widget font to match the platform's native look and feel. Because of this, assigning properties to a widget's font is not guaranteed to change the appearance of the widget. Instead, you may choose @@ -5210,6 +5172,7 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset, // Save current system clip, viewport and transform, const QTransform oldTransform = enginePriv->systemTransform; const QRegion oldSystemClip = enginePriv->systemClip; + const QRegion oldBaseClip = enginePriv->baseSystemClip; const QRegion oldSystemViewport = enginePriv->systemViewport; // This ensures that all painting triggered by render() is clipped to the current engine clip. @@ -5223,9 +5186,8 @@ void QWidget::render(QPainter *painter, const QPoint &targetOffset, d->render(target, targetOffset, toBePainted, renderFlags); // Restore system clip, viewport and transform. - enginePriv->setSystemViewport(oldSystemViewport); - enginePriv->setSystemTransform(oldTransform); - enginePriv->systemClip = oldSystemClip; + enginePriv->baseSystemClip = oldBaseClip; + enginePriv->setSystemTransformAndViewport(oldTransform, oldSystemViewport); enginePriv->systemStateChanged(); // Restore shared painter. @@ -5517,12 +5479,12 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP QWidgetPaintContext context(pdev, rgn, offset, flags, sharedPainter, backingStore); sourced->context = &context; if (!sharedPainter) { - setSystemClip(pdev, rgn.translated(offset)); + setSystemClip(pdev->paintEngine(), pdev->devicePixelRatioF(), rgn.translated(offset)); QPainter p(pdev); p.translate(offset); context.painter = context.sharedPainter = &p; graphicsEffect->draw(&p); - setSystemClip(pdev, QRegion()); + setSystemClip(pdev->paintEngine(), 1, QRegion()); } else { context.painter = context.sharedPainter = sharedPainter; if (sharedPainter->worldTransform() != sourced->lastEffectTransform) { @@ -5531,7 +5493,9 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP } sharedPainter->save(); sharedPainter->translate(offset); + setSystemClip(sharedPainter->paintEngine(), sharedPainter->device()->devicePixelRatioF(), rgn.translated(offset)); graphicsEffect->draw(sharedPainter); + setSystemClip(sharedPainter->paintEngine(), 1, QRegion()); sharedPainter->restore(); } sourced->context = 0; @@ -5583,7 +5547,7 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP #endif if (sharedPainter) - setSystemClip(pdev, toBePainted); + setSystemClip(pdev->paintEngine(), pdev->devicePixelRatioF(), toBePainted); else paintEngine->d_func()->systemRect = q->data->crect; @@ -5601,7 +5565,7 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP } if (!sharedPainter) - setSystemClip(pdev, toBePainted.translated(offset)); + setSystemClip(pdev->paintEngine(), pdev->devicePixelRatioF(), toBePainted.translated(offset)); if (!onScreen && !asRoot && !isOpaque && q->testAttribute(Qt::WA_TintedBackground)) { #ifndef QT_NO_OPENGL @@ -5671,7 +5635,7 @@ void QWidgetPrivate::drawWidget(QPaintDevice *pdev, const QRegion &rgn, const QP else paintEngine->d_func()->currentClipDevice = 0; - setSystemClip(pdev, QRegion()); + setSystemClip(pdev->paintEngine(), 1, QRegion()); } q->setAttribute(Qt::WA_WState_InPaintEvent, false); if (Q_UNLIKELY(q->paintingActive())) @@ -6529,9 +6493,9 @@ void QWidget::setFocus(Qt::FocusReason reason) if (!isEnabled()) return; - QWidget *f = this; - while (f->d_func()->extra && f->d_func()->extra->focus_proxy) - f = f->d_func()->extra->focus_proxy; + QWidget *f = d_func()->deepestFocusProxy(); + if (!f) + f = this; if (QApplication::focusWidget() == f #if 0 // Used to be included in Qt4 for Q_WS_WIN @@ -6628,6 +6592,27 @@ void QWidget::setFocus(Qt::FocusReason reason) } } + +/*!\internal + * A focus proxy can have its own focus proxy, which can have its own + * proxy, and so on. This helper function returns the widget that sits + * at the bottom of the proxy chain, and therefore the one that should + * normally get focus if this widget receives a focus request. + */ +QWidget *QWidgetPrivate::deepestFocusProxy() const +{ + Q_Q(const QWidget); + + QWidget *focusProxy = q->focusProxy(); + if (!focusProxy) + return nullptr; + + while (QWidget *nextFocusProxy = focusProxy->focusProxy()) + focusProxy = nextFocusProxy; + + return focusProxy; +} + void QWidgetPrivate::setFocus_sys() { Q_Q(QWidget); @@ -6930,6 +6915,9 @@ bool QWidget::isActiveWindow() const /*! Puts the \a second widget after the \a first widget in the focus order. + It effectively removes the \a second widget from its focus chain and + inserts it after the \a first widget. + Note that since the tab order of the \a second widget is changed, you should order a chain like this: @@ -6942,11 +6930,19 @@ bool QWidget::isActiveWindow() const If \a first or \a second has a focus proxy, setTabOrder() correctly substitutes the proxy. + \note Since Qt 5.10: A widget that has a child as focus proxy is understood as + a compound widget. When setting a tab order between one or two compound widgets, the + local tab order inside each will be preserved. This means that if both widgets are + compound widgets, the resulting tab order will be from the last child inside + \a first, to the first child inside \a second. + \sa setFocusPolicy(), setFocusProxy(), {Keyboard Focus in Widgets} */ void QWidget::setTabOrder(QWidget* first, QWidget *second) { - if (!first || !second || first->focusPolicy() == Qt::NoFocus || second->focusPolicy() == Qt::NoFocus) + if (!first || !second || first == second + || first->focusPolicy() == Qt::NoFocus + || second->focusPolicy() == Qt::NoFocus) return; if (Q_UNLIKELY(first->window() != second->window())) { @@ -6954,54 +6950,56 @@ void QWidget::setTabOrder(QWidget* first, QWidget *second) return; } - QWidget *fp = first->focusProxy(); - if (fp) { - // If first is redirected, set first to the last child of first - // that can take keyboard focus so that second is inserted after - // that last child, and the focus order within first is (more - // likely to be) preserved. - QList<QWidget *> l = first->findChildren<QWidget *>(); - for (int i = l.size()-1; i >= 0; --i) { - QWidget * next = l.at(i); - if (next->window() == fp->window()) { - fp = next; - if (fp->focusPolicy() != Qt::NoFocus) - break; - } - } - first = fp; - } + auto determineLastFocusChild = [](QWidget *target, QWidget *&lastFocusChild) + { + // Since we need to repeat the same logic for both 'first' and 'second', we add a function that + // determines the last focus child for a widget, taking proxies and compound widgets into account. + // If the target is not a compound widget (it doesn't have a focus proxy that points to a child), + // 'lastFocusChild' will be set to the target itself. + lastFocusChild = target; + + QWidget *focusProxy = target->d_func()->deepestFocusProxy(); + if (!focusProxy || !target->isAncestorOf(focusProxy)) + return; - if (fp == second) - return; + lastFocusChild = focusProxy; - if (QWidget *sp = second->focusProxy()) - second = sp; + for (QWidget *focusNext = lastFocusChild->d_func()->focus_next; + focusNext != focusProxy && target->isAncestorOf(focusNext) && focusNext->window() == focusProxy->window(); + focusNext = focusNext->d_func()->focus_next) { + if (focusNext->focusPolicy() != Qt::NoFocus) + lastFocusChild = focusNext; + } + }; -// QWidget *fp = first->d_func()->focus_prev; - QWidget *fn = first->d_func()->focus_next; + QWidget *lastFocusChildOfFirst, *lastFocusChildOfSecond; + determineLastFocusChild(first, lastFocusChildOfFirst); + determineLastFocusChild(second, lastFocusChildOfSecond); - if (fn == second || first == second) + // If the tab order is already correct, exit early + if (lastFocusChildOfFirst->d_func()->focus_next == second) return; - QWidget *sp = second->d_func()->focus_prev; - QWidget *sn = second->d_func()->focus_next; - - fn->d_func()->focus_prev = second; - first->d_func()->focus_next = second; - - second->d_func()->focus_next = fn; - second->d_func()->focus_prev = first; + // Note that we need to handle two different sections in the tab chain; The section + // that 'first' belongs to (firstSection), where we are about to insert 'second', and + // the section that 'second' used be a part of (secondSection). When we pull 'second' + // out of the second section and insert it into the first, we also need to ensure + // that we leave the second section in a connected state. + QWidget *firstChainOldSecond = lastFocusChildOfFirst->d_func()->focus_next; + QWidget *secondChainNewFirst = second->d_func()->focus_prev; + QWidget *secondChainNewSecond = lastFocusChildOfSecond->d_func()->focus_next; - sp->d_func()->focus_next = sn; - sn->d_func()->focus_prev = sp; + // Insert 'second' after 'first' + lastFocusChildOfFirst->d_func()->focus_next = second; + second->d_func()->focus_prev = lastFocusChildOfFirst; + // The widget that used to be 'second' in the first section, should now become 'third' + lastFocusChildOfSecond->d_func()->focus_next = firstChainOldSecond; + firstChainOldSecond->d_func()->focus_prev = lastFocusChildOfSecond; - Q_ASSERT(first->d_func()->focus_next->d_func()->focus_prev == first); - Q_ASSERT(first->d_func()->focus_prev->d_func()->focus_next == first); - - Q_ASSERT(second->d_func()->focus_next->d_func()->focus_prev == second); - Q_ASSERT(second->d_func()->focus_prev->d_func()->focus_next == second); + // Repair the second section after we pulled 'second' out of it + secondChainNewFirst->d_func()->focus_next = secondChainNewSecond; + secondChainNewSecond->d_func()->focus_prev = secondChainNewFirst; } /*!\internal @@ -7173,7 +7171,7 @@ void QWidgetPrivate::fixPosIncludesFrame() if (q->testAttribute(Qt::WA_DontShowOnScreen)) { te->posIncludesFrame = 0; } else { - if (q->windowHandle()) { + if (q->windowHandle() && q->windowHandle()->handle()) { updateFrameStrut(); if (!q->data->fstrut_dirty) { data.crect.translate(te->frameStrut.x(), te->frameStrut.y()); @@ -7375,7 +7373,7 @@ QByteArray QWidget::saveGeometry() const // - Qt 4.8.6 - today, 5.4 - today: Version 2.0, save screen width in addition to check for high DPI scaling. quint16 majorVersion = 2; quint16 minorVersion = 0; - const int screenNumber = QApplication::desktop()->screenNumber(this); + const int screenNumber = QDesktopWidgetPrivate::screenNumber(this); stream << magicNumber << majorVersion << minorVersion @@ -7389,7 +7387,7 @@ QByteArray QWidget::saveGeometry() const << qint32(screenNumber) << quint8(windowState() & Qt::WindowMaximized) << quint8(windowState() & Qt::WindowFullScreen) - << qint32(QApplication::desktop()->screenGeometry(screenNumber).width()); // 1.1 onwards + << qint32(QDesktopWidgetPrivate::screenGeometry(screenNumber).width()); // 1.1 onwards return array; } @@ -7455,10 +7453,9 @@ bool QWidget::restoreGeometry(const QByteArray &geometry) if (majorVersion > 1) stream >> restoredScreenWidth; - const QDesktopWidget * const desktop = QApplication::desktop(); - if (restoredScreenNumber >= desktop->numScreens()) - restoredScreenNumber = desktop->primaryScreen(); - const qreal screenWidthF = qreal(desktop->screenGeometry(restoredScreenNumber).width()); + if (restoredScreenNumber >= QDesktopWidgetPrivate::numScreens()) + restoredScreenNumber = QDesktopWidgetPrivate::primaryScreen(); + const qreal screenWidthF = qreal(QDesktopWidgetPrivate::screenGeometry(restoredScreenNumber).width()); // Sanity check bailing out when large variations of screen sizes occur due to // high DPI scaling or different levels of DPI awareness. if (restoredScreenWidth) { @@ -7485,7 +7482,7 @@ bool QWidget::restoreGeometry(const QByteArray &geometry) .expandedTo(d_func()->adjustedSize())); } - const QRect availableGeometry = desktop->availableGeometry(restoredScreenNumber); + const QRect availableGeometry = QDesktopWidgetPrivate::availableGeometry(restoredScreenNumber); // Modify the restored geometry if we are about to restore to coordinates // that would make the window "lost". This happens if: @@ -7526,7 +7523,7 @@ bool QWidget::restoreGeometry(const QByteArray &geometry) // Setting a geometry on an already maximized window causes this to be // restored into a broken, half-maximized state, non-resizable state (QTBUG-4397). // Move the window in normal state if needed. - if (restoredScreenNumber != desktop->screenNumber(this)) { + if (restoredScreenNumber != QDesktopWidgetPrivate::screenNumber(this)) { setWindowState(Qt::WindowNoState); setGeometry(restoredNormalGeometry); } @@ -7988,7 +7985,7 @@ void QWidgetPrivate::show_helper() const bool isWindow = q->isWindow(); #if QT_CONFIG(graphicsview) - bool isEmbedded = isWindow && q->graphicsProxyWidget() != Q_NULLPTR; + bool isEmbedded = isWindow && q->graphicsProxyWidget() != nullptr; #else bool isEmbedded = false; #endif @@ -8067,7 +8064,7 @@ void QWidgetPrivate::show_sys() { Q_Q(QWidget); - QWindow *window = q->windowHandle(); + QWidgetWindow *window = windowHandle(); if (q->testAttribute(Qt::WA_DontShowOnScreen)) { invalidateBuffer(q->rect()); @@ -8114,7 +8111,7 @@ void QWidgetPrivate::show_sys() qt_qpa_set_cursor(q, false); // Needed in case cursor was set before show #endif invalidateBuffer(q->rect()); - window->setVisible(true); + window->setNativeWindowVisibility(true); // Was the window moved by the Window system or QPlatformWindow::initialGeometry() ? if (window->isTopLevel()) { const QPoint crectTopLeft = q->data->crect.topLeft(); @@ -8206,7 +8203,7 @@ void QWidgetPrivate::hide_sys() { Q_Q(QWidget); - QWindow *window = q->windowHandle(); + QWidgetWindow *window = windowHandle(); if (q->testAttribute(Qt::WA_DontShowOnScreen)) { q->setAttribute(Qt::WA_Mapped, false); @@ -8236,7 +8233,7 @@ void QWidgetPrivate::hide_sys() } if (window) - window->setVisible(false); + window->setNativeWindowVisibility(false); } /*! @@ -8678,9 +8675,9 @@ QSize QWidgetPrivate::adjustedSize() const if (exp & Qt::Vertical) s.setHeight(qMax(s.height(), 100)); #if 0 // Used to be included in Qt4 for Q_WS_X11 - QRect screen = QApplication::desktop()->screenGeometry(q->x11Info().screen()); + QRect screen = QDesktopWidgetPrivate::screenGeometry(q->x11Info().screen()); #else // all others - QRect screen = QApplication::desktop()->screenGeometry(q->pos()); + QRect screen = QDesktopWidgetPrivate::screenGeometry(q->pos()); #endif s.setWidth(qMin(s.width(), screen.width()*2/3)); s.setHeight(qMin(s.height(), screen.height()*2/3)); @@ -10113,6 +10110,7 @@ void QWidget::hideEvent(QHideEvent *) \table \header \li Platform \li Event Type Identifier \li Message Type \li Result Type \row \li Windows \li "windows_generic_MSG" \li MSG * \li LRESULT + \row \li macOS \li "NSEvent" \li NSEvent * \li \endtable */ @@ -10823,7 +10821,7 @@ void QWidgetPrivate::setParent_sys(QWidget *newparent, Qt::WindowFlags f) f |= Qt::Window; if (targetScreen == -1) { if (parent) - targetScreen = QApplication::desktop()->screenNumber(q->parentWidget()->window()); + targetScreen = QDesktopWidgetPrivate::screenNumber(q->parentWidget()->window()); } } @@ -11222,10 +11220,7 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on) case Qt::WA_NoChildEventsFromChildren: d->receiveChildEvents = !on; break; - case Qt::WA_MacBrushedMetal: #if 0 // Used to be included in Qt4 for Q_WS_MAC - d->setStyle_helper(style(), false, true); // Make sure things get unpolished/polished correctly. - // fall through since changing the metal attribute affects the opaque size grip. case Qt::WA_MacOpaqueSizeGrip: d->macUpdateOpaqueSizeGrip(); break; @@ -11238,12 +11233,10 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on) case Qt::WA_Hover: qt_mac_update_mouseTracking(this); break; -#endif case Qt::WA_MacAlwaysShowToolWindow: -#if 0 // Used to be included in Qt4 for Q_WS_MAC d->macUpdateHideOnSuspend(); -#endif break; +#endif case Qt::WA_MacNormalSize: case Qt::WA_MacSmallSize: case Qt::WA_MacMiniSize: @@ -12310,10 +12303,9 @@ QOpenGLContext *QWidgetPrivate::shareContext() const #ifdef QT_NO_OPENGL return 0; #else - if (Q_UNLIKELY(!extra || !extra->topextra || !extra->topextra->window)) { - qWarning("Asking for share context for widget that does not have a window handle"); + if (Q_UNLIKELY(!extra || !extra->topextra || !extra->topextra->window)) return 0; - } + QWidgetPrivate *that = const_cast<QWidgetPrivate *>(this); if (!extra->topextra->shareContext) { QOpenGLContext *ctx = new QOpenGLContext; @@ -12509,7 +12501,7 @@ static inline bool canMapPosition(QWindow *window) #if QT_CONFIG(graphicsview) static inline QGraphicsProxyWidget *graphicsProxyWidget(const QWidget *w) { - QGraphicsProxyWidget *result = Q_NULLPTR; + QGraphicsProxyWidget *result = nullptr; const QWidgetPrivate *d = qt_widget_private(const_cast<QWidget *>(w)); if (d->extra) result = d->extra->proxyWidget; @@ -12525,7 +12517,7 @@ struct MapToGlobalTransformResult { static MapToGlobalTransformResult mapToGlobalTransform(const QWidget *w) { MapToGlobalTransformResult result; - result.window = Q_NULLPTR; + result.window = nullptr; for ( ; w ; w = w->parentWidget()) { #if QT_CONFIG(graphicsview) if (QGraphicsProxyWidget *qgpw = graphicsProxyWidget(w)) { diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index 732af4de09..5087d330ee 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -211,10 +211,10 @@ public: }; Q_DECLARE_FLAGS(RenderFlags, RenderFlag) - explicit QWidget(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); + explicit QWidget(QWidget* parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); ~QWidget(); - int devType() const Q_DECL_OVERRIDE; + int devType() const override; WId winId() const; void createWinId(); // internal, going away @@ -578,7 +578,7 @@ public: void setAttribute(Qt::WidgetAttribute, bool on = true); inline bool testAttribute(Qt::WidgetAttribute) const; - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + QPaintEngine *paintEngine() const override; void ensurePolished() const; @@ -596,7 +596,7 @@ public: QWindow *windowHandle() const; - static QWidget *createWindowContainer(QWindow *window, QWidget *parent=Q_NULLPTR, Qt::WindowFlags flags=Qt::WindowFlags()); + static QWidget *createWindowContainer(QWindow *window, QWidget *parent=nullptr, Qt::WindowFlags flags=Qt::WindowFlags()); friend class QDesktopScreenWidget; @@ -608,7 +608,7 @@ Q_SIGNALS: protected: // Event handlers - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; virtual void mousePressEvent(QMouseEvent *event); virtual void mouseReleaseEvent(QMouseEvent *event); virtual void mouseDoubleClickEvent(QMouseEvent *event); @@ -650,10 +650,10 @@ protected: // Misc. protected functions virtual void changeEvent(QEvent *); - int metric(PaintDeviceMetric) const Q_DECL_OVERRIDE; - void initPainter(QPainter *painter) const Q_DECL_OVERRIDE; - QPaintDevice *redirected(QPoint *offset) const Q_DECL_OVERRIDE; - QPainter *sharedPainter() const Q_DECL_OVERRIDE; + int metric(PaintDeviceMetric) const override; + void initPainter(QPainter *painter) const override; + QPaintDevice *redirected(QPoint *offset) const override; + QPainter *sharedPainter() const override; virtual void inputMethodEvent(QInputMethodEvent *); public: @@ -738,12 +738,12 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QWidget::RenderFlags) #ifndef Q_QDOC template <> inline QWidget *qobject_cast<QWidget*>(QObject *o) { - if (!o || !o->isWidgetType()) return Q_NULLPTR; + if (!o || !o->isWidgetType()) return nullptr; return static_cast<QWidget*>(o); } template <> inline const QWidget *qobject_cast<const QWidget*>(const QObject *o) { - if (!o || !o->isWidgetType()) return Q_NULLPTR; + if (!o || !o->isWidgetType()) return nullptr; return static_cast<const QWidget*>(o); } #endif // !Q_QDOC diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index 15704f32c9..a9c73c6a26 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -73,19 +73,20 @@ #include "QtWidgets/qgraphicsview.h" #endif #include <private/qgesture_p.h> +#include <qpa/qplatformbackingstore.h> QT_BEGIN_NAMESPACE // Extra QWidget data // - to minimize memory usage for members that are seldom used. // - top-level widgets have extra extra data to reduce cost further +class QWidgetWindow; class QPaintEngine; class QPixmap; class QWidgetBackingStore; class QGraphicsProxyWidget; class QWidgetItemV2; class QOpenGLContext; -class QPlatformTextureList; class QStyle; @@ -164,7 +165,7 @@ struct QTLWExtra { QWidgetBackingStoreTracker backingStoreTracker; QBackingStore *backingStore; QPainter *sharedPainter; - QWindow *window; + QWidgetWindow *window; QOpenGLContext *shareContext; // Implicit pointers (shared_null). @@ -342,6 +343,7 @@ public: QPainter *sharedPainter() const; void setSharedPainter(QPainter *painter); QWidgetBackingStore *maybeBackingStore() const; + QWidgetWindow *windowHandle() const; template <typename T> void repaint(T t); @@ -374,6 +376,7 @@ public: void lower_sys(); void stackUnder_sys(QWidget *); + QWidget *deepestFocusProxy() const; void setFocus_sys(); void updateFocusChild(); @@ -420,7 +423,7 @@ public: QRect clipRect() const; QRegion clipRegion() const; - void setSystemClip(QPaintDevice *paintDevice, const QRegion ®ion); + void setSystemClip(QPaintEngine *paintEngine, qreal devicePixelRatio, const QRegion ®ion); void subtractOpaqueChildren(QRegion &rgn, const QRect &clipRect) const; void subtractOpaqueSiblings(QRegion &source, bool *hasDirtySiblingsAbove = 0, bool alsoNonOpaque = false) const; @@ -644,6 +647,12 @@ public: #ifndef QT_NO_OPENGL virtual GLuint textureId() const { return 0; } + virtual QPlatformTextureList::Flags textureListFlags() { + Q_Q(QWidget); + return q->testAttribute(Qt::WA_AlwaysStackOnTop) + ? QPlatformTextureList::StacksOnTop + : QPlatformTextureList::Flags(0); + } virtual QImage grabFramebuffer() { return QImage(); } virtual void beginBackingStorePainting() { } virtual void endBackingStorePainting() { } @@ -904,26 +913,26 @@ public: : QGraphicsEffectSourcePrivate(), m_widget(widget), context(0), updateDueToGraphicsEffect(false) {} - void detach() Q_DECL_OVERRIDE + void detach() override { m_widget->d_func()->graphicsEffect = 0; } - const QGraphicsItem *graphicsItem() const Q_DECL_OVERRIDE + const QGraphicsItem *graphicsItem() const override { return 0; } - const QWidget *widget() const Q_DECL_OVERRIDE + const QWidget *widget() const override { return m_widget; } - void update() Q_DECL_OVERRIDE + void update() override { updateDueToGraphicsEffect = true; m_widget->update(); updateDueToGraphicsEffect = false; } - bool isPixmap() const Q_DECL_OVERRIDE + bool isPixmap() const override { return false; } - void effectBoundingRectChanged() Q_DECL_OVERRIDE + void effectBoundingRectChanged() override { // ### This function should take a rect parameter; then we can avoid // updating too much on the parent widget. @@ -933,16 +942,16 @@ public: update(); } - const QStyleOption *styleOption() const Q_DECL_OVERRIDE + const QStyleOption *styleOption() const override { return 0; } - QRect deviceRect() const Q_DECL_OVERRIDE + QRect deviceRect() const override { return m_widget->window()->rect(); } - QRectF boundingRect(Qt::CoordinateSystem system) const Q_DECL_OVERRIDE; - void draw(QPainter *p) Q_DECL_OVERRIDE; + QRectF boundingRect(Qt::CoordinateSystem system) const override; + void draw(QPainter *p) override; QPixmap pixmap(Qt::CoordinateSystem system, QPoint *offset, - QGraphicsEffect::PixmapPadMode mode) const Q_DECL_OVERRIDE; + QGraphicsEffect::PixmapPadMode mode) const override; QWidget *m_widget; QWidgetPaintContext *context; @@ -995,6 +1004,13 @@ inline QWidgetBackingStore *QWidgetPrivate::maybeBackingStore() const return x ? x->backingStoreTracker.data() : 0; } +inline QWidgetWindow *QWidgetPrivate::windowHandle() const +{ + if (QTLWExtra *x = maybeTopData()) + return x->window; + return nullptr; +} + QT_END_NAMESPACE #endif // QWIDGET_P_H diff --git a/src/widgets/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h index 3da691a430..4769332a23 100644 --- a/src/widgets/kernel/qwidgetaction.h +++ b/src/widgets/kernel/qwidgetaction.h @@ -66,8 +66,8 @@ public: void releaseWidget(QWidget *widget); protected: - virtual bool event(QEvent *) Q_DECL_OVERRIDE; - virtual bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + virtual bool event(QEvent *) override; + virtual bool eventFilter(QObject *, QEvent *) override; virtual QWidget *createWidget(QWidget *parent); virtual void deleteWidget(QWidget *widget); QList<QWidget *> createdWidgets() const; diff --git a/src/widgets/kernel/qwidgetbackingstore.cpp b/src/widgets/kernel/qwidgetbackingstore.cpp index 57564ce477..3b093283cd 100644 --- a/src/widgets/kernel/qwidgetbackingstore.cpp +++ b/src/widgets/kernel/qwidgetbackingstore.cpp @@ -77,11 +77,10 @@ Q_GLOBAL_STATIC(QPlatformTextureList, qt_dummy_platformTextureList) /** * Flushes the contents of the \a backingStore into the screen area of \a widget. - * \a tlwOffset is the position of the top level widget relative to the window surface. * \a region is the region to be updated in \a widget coordinates. */ void QWidgetBackingStore::qt_flush(QWidget *widget, const QRegion ®ion, QBackingStore *backingStore, - QWidget *tlw, const QPoint &tlwOffset, QPlatformTextureList *widgetTextures, + QWidget *tlw, QPlatformTextureList *widgetTextures, QWidgetBackingStore *widgetBackingStore) { #ifdef QT_NO_OPENGL @@ -112,7 +111,7 @@ void QWidgetBackingStore::qt_flush(QWidget *widget, const QRegion ®ion, QBack } } - QPoint offset = tlwOffset; + QPoint offset; if (widget != tlw) offset += widget->mapTo(tlw, QPoint()); @@ -144,10 +143,8 @@ void QWidgetBackingStore::qt_flush(QWidget *widget, const QRegion ®ion, QBack // WA_TranslucentBackground. Therefore the compositor needs to know whether the app intends // to rely on translucency, in order to decide if it should clear to transparent or opaque. const bool translucentBackground = widget->testAttribute(Qt::WA_TranslucentBackground); - // Use the tlw's context, not widget's. The difference is important with native child - // widgets where tlw != widget. - backingStore->handle()->composeAndFlush(widget->windowHandle(), effectiveRegion, offset, widgetTextures, - tlw->d_func()->shareContext(), translucentBackground); + backingStore->handle()->composeAndFlush(widget->windowHandle(), effectiveRegion, offset, + widgetTextures, translucentBackground); widget->window()->d_func()->sendComposeStatus(widget->window(), true); } else #endif @@ -288,8 +285,7 @@ void QWidgetBackingStore::unflushPaint(QWidget *widget, const QRegion &rgn) if (!tlwExtra) return; - const QPoint offset = widget->mapTo(tlw, QPoint()); - qt_flush(widget, rgn, tlwExtra->backingStoreTracker->store, tlw, offset, 0, tlw->d_func()->maybeBackingStore()); + qt_flush(widget, rgn, tlwExtra->backingStoreTracker->store, tlw, 0, tlw->d_func()->maybeBackingStore()); } #endif // QT_NO_PAINT_DEBUG @@ -299,7 +295,7 @@ void QWidgetBackingStore::unflushPaint(QWidget *widget, const QRegion &rgn) */ bool QWidgetBackingStore::bltRect(const QRect &rect, int dx, int dy, QWidget *widget) { - const QPoint pos(tlwOffset + widget->mapTo(tlw, rect.topLeft())); + const QPoint pos(widget->mapTo(tlw, rect.topLeft())); const QRect tlwRect(QRect(pos, rect.size())); if (dirty.intersects(tlwRect)) return false; // We don't want to scroll junk. @@ -949,9 +945,7 @@ static void findTextureWidgetsRecursively(QWidget *tlw, QWidget *widget, QPlatfo { QWidgetPrivate *wd = QWidgetPrivate::get(widget); if (wd->renderToTexture) { - QPlatformTextureList::Flags flags = 0; - if (widget->testAttribute(Qt::WA_AlwaysStackOnTop)) - flags |= QPlatformTextureList::StacksOnTop; + QPlatformTextureList::Flags flags = wd->textureListFlags(); const QRect rect(widget->mapTo(tlw, QPoint()), widget->size()); widgetTextures->appendTexture(widget, wd->textureId(), rect, wd->clipRect(), flags); } @@ -1064,7 +1058,7 @@ static QPlatformTextureList *widgetTexturesFor(QWidget *tlw, QWidget *widget) { Q_UNUSED(tlw); Q_UNUSED(widget); - return Q_NULLPTR; + return nullptr; } #endif // QT_NO_OPENGL @@ -1123,7 +1117,7 @@ void QWidgetBackingStore::sync(QWidget *exposedWidget, const QRegion &exposedReg // Nothing to repaint. if (!isDirty() && store->size().isValid()) { QPlatformTextureList *tl = widgetTexturesFor(tlw, exposedWidget); - qt_flush(exposedWidget, tl ? QRegion() : exposedRegion, store, tlw, tlwOffset, tl, this); + qt_flush(exposedWidget, tl ? QRegion() : exposedRegion, store, tlw, tl, this); return; } @@ -1369,7 +1363,7 @@ void QWidgetBackingStore::doSync() QRegion toBePainted(wd->dirty); resetWidget(w); - QPoint offset(tlwOffset); + QPoint offset; if (w != tlw) offset += w->mapTo(tlw, QPoint()); wd->drawWidget(store->paintDevice(), toBePainted, offset, flags, 0, this); @@ -1378,7 +1372,7 @@ void QWidgetBackingStore::doSync() // Paint the rest with composition. if (repaintAllWidgets || !dirtyCopy.isEmpty()) { const int flags = QWidgetPrivate::DrawAsRoot | QWidgetPrivate::DrawRecursive; - tlw->d_func()->drawWidget(store->paintDevice(), dirtyCopy, tlwOffset, flags, 0, this); + tlw->d_func()->drawWidget(store->paintDevice(), dirtyCopy, QPoint(), flags, 0, this); } endPaint(toClean, store, &beginPaintInfo); @@ -1397,7 +1391,7 @@ void QWidgetBackingStore::flush(QWidget *widget) // Flush the region in dirtyOnScreen. if (!dirtyOnScreen.isEmpty()) { QWidget *target = widget ? widget : tlw; - qt_flush(target, dirtyOnScreen, store, tlw, tlwOffset, widgetTexturesFor(tlw, tlw), this); + qt_flush(target, dirtyOnScreen, store, tlw, widgetTexturesFor(tlw, tlw), this); dirtyOnScreen = QRegion(); flushed = true; } @@ -1409,7 +1403,7 @@ void QWidgetBackingStore::flush(QWidget *widget) QPlatformTextureList *tl = widgetTexturesFor(tlw, tlw); if (tl) { QWidget *target = widget ? widget : tlw; - qt_flush(target, QRegion(), store, tlw, tlwOffset, tl, this); + qt_flush(target, QRegion(), store, tlw, tl, this); } } #endif @@ -1423,7 +1417,7 @@ void QWidgetBackingStore::flush(QWidget *widget) QWidgetPrivate *wd = w->d_func(); Q_ASSERT(wd->needsFlush); QPlatformTextureList *widgetTexturesForNative = wd->textureChildSeen ? widgetTexturesFor(tlw, w) : 0; - qt_flush(w, *wd->needsFlush, store, tlw, tlwOffset, widgetTexturesForNative, this); + qt_flush(w, *wd->needsFlush, store, tlw, widgetTexturesForNative, this); *wd->needsFlush = QRegion(); } dirtyOnScreenWidgets->clear(); diff --git a/src/widgets/kernel/qwidgetbackingstore_p.h b/src/widgets/kernel/qwidgetbackingstore_p.h index fa51cb71de..53ccda850a 100644 --- a/src/widgets/kernel/qwidgetbackingstore_p.h +++ b/src/widgets/kernel/qwidgetbackingstore_p.h @@ -111,8 +111,6 @@ public: void sync(); void flush(QWidget *widget = 0); - inline QPoint topLevelOffset() const { return tlwOffset; } - QBackingStore *backingStore() const { return store; } inline bool isDirty() const @@ -138,8 +136,6 @@ private: QBackingStore *store; uint updateRequestSent : 1; - QPoint tlwOffset; - QPlatformTextureListWatcher *textureListWatcher; QElapsedTimer perfTime; int perfFrames; @@ -149,7 +145,7 @@ private: static bool flushPaint(QWidget *widget, const QRegion &rgn); static void unflushPaint(QWidget *widget, const QRegion &rgn); static void qt_flush(QWidget *widget, const QRegion ®ion, QBackingStore *backingStore, - QWidget *tlw, const QPoint &tlwOffset, + QWidget *tlw, QPlatformTextureList *widgetTextures, QWidgetBackingStore *widgetBackingStore); diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index 165dce04e9..1078652234 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE Q_WIDGETS_EXPORT extern bool qt_tab_all_widgets(); -QWidget *qt_button_down = 0; // widget got last button-down +Q_WIDGETS_EXPORT QWidget *qt_button_down = 0; // widget got last button-down // popup control QWidget *qt_popup_down = 0; // popup that contains the pressed widget @@ -69,7 +69,16 @@ class QWidgetWindowPrivate : public QWindowPrivate { Q_DECLARE_PUBLIC(QWidgetWindow) public: - QWindow *eventReceiver() Q_DECL_OVERRIDE { + void setVisible(bool visible) override + { + Q_Q(QWidgetWindow); + if (QWidget *widget = q->widget()) + widget->setVisible(visible); + else + QWindowPrivate::setVisible(visible); + } + + QWindow *eventReceiver() override { Q_Q(QWidgetWindow); QWindow *w = q; while (w->parent() && qobject_cast<QWidgetWindow *>(w) && qobject_cast<QWidgetWindow *>(w->parent())) { @@ -78,7 +87,7 @@ public: return w; } - void clearFocusObject() Q_DECL_OVERRIDE + void clearFocusObject() override { Q_Q(QWidgetWindow); QWidget *widget = q->widget(); @@ -86,7 +95,10 @@ public: widget->focusWidget()->clearFocus(); } - QRectF closestAcceptableGeometry(const QRectF &rect) const Q_DECL_OVERRIDE; + QRectF closestAcceptableGeometry(const QRectF &rect) const override; +#if QT_CONFIG(opengl) + QOpenGLContext *shareContext() const override; +#endif void processSafeAreaMarginsChanged() override { @@ -125,6 +137,15 @@ QRectF QWidgetWindowPrivate::closestAcceptableGeometry(const QRectF &rect) const return result; } +#if QT_CONFIG(opengl) +QOpenGLContext *QWidgetWindowPrivate::shareContext() const +{ + Q_Q(const QWidgetWindow); + const QWidgetPrivate *widgetPrivate = QWidgetPrivate::get(q->widget()); + return widgetPrivate->shareContext(); +} +#endif // opengl + QWidgetWindow::QWidgetWindow(QWidget *widget) : QWindow(*new QWidgetWindowPrivate(), 0) , m_widget(widget) @@ -157,7 +178,7 @@ QObject *QWidgetWindow::focusObject() const { QWidget *windowWidget = m_widget; if (!windowWidget) - return Q_NULLPTR; + return nullptr; // A window can't have a focus object if it's being destroyed. if (QWidgetPrivate::get(windowWidget)->data.in_destructor) @@ -175,6 +196,15 @@ QObject *QWidgetWindow::focusObject() const return widget; } +void QWidgetWindow::setNativeWindowVisibility(bool visible) +{ + Q_D(QWidgetWindow); + // Call base class setVisible() implementation to run the QWindow + // visibility logic. Don't call QWidgetWindowPrivate::setVisible() + // since that will recurse back into QWidget code. + d->QWindowPrivate::setVisible(visible); +} + static inline bool shouldBePropagatedToWidget(QEvent *event) { switch (event->type()) { @@ -201,7 +231,7 @@ bool QWidgetWindow::event(QEvent *event) // generated before WA_DontShowOnScreen was set if (!shouldBePropagatedToWidget(event)) return true; - return QCoreApplication::sendEvent(m_widget, event); + return QCoreApplication::forwardEvent(m_widget, event); } switch (event->type()) { @@ -218,7 +248,7 @@ bool QWidgetWindow::event(QEvent *event) // are sent by QApplicationPrivate::notifyActiveWindowChange() case QEvent::FocusIn: handleFocusInEvent(static_cast<QFocusEvent *>(event)); - // Fallthrough + Q_FALLTHROUGH(); case QEvent::FocusOut: { #ifndef QT_NO_ACCESSIBILITY QAccessible::State state; @@ -233,7 +263,7 @@ bool QWidgetWindow::event(QEvent *event) if (QApplicationPrivate::focus_widget->testAttribute(Qt::WA_InputMethodEnabled)) QGuiApplication::inputMethod()->commit(); - QGuiApplication::sendSpontaneousEvent(QApplicationPrivate::focus_widget, event); + QGuiApplication::forwardEvent(QApplicationPrivate::focus_widget, event); } return true; @@ -302,7 +332,7 @@ bool QWidgetWindow::event(QEvent *event) case QEvent::ThemeChange: { QEvent widgetEvent(QEvent::ThemeChange); - QGuiApplication::sendSpontaneousEvent(m_widget, &widgetEvent); + QCoreApplication::forwardEvent(m_widget, &widgetEvent, event); } return true; @@ -340,7 +370,7 @@ bool QWidgetWindow::event(QEvent *event) break; } - if (shouldBePropagatedToWidget(event) && QCoreApplication::sendEvent(m_widget, event)) + if (shouldBePropagatedToWidget(event) && QCoreApplication::forwardEvent(m_widget, event)) return true; return QWindow::event(event); @@ -399,7 +429,7 @@ void QWidgetWindow::handleEnterLeaveEvent(QEvent *event) const QEnterEvent *ee = static_cast<QEnterEvent *>(event); QWidget *child = m_widget->childAt(ee->pos()); QWidget *receiver = child ? child : m_widget.data(); - QWidget *leave = Q_NULLPTR; + QWidget *leave = nullptr; if (QApplicationPrivate::inPopupMode() && receiver == m_widget && qt_last_mouse_receiver != m_widget) { // This allows to deliver the leave event to the native widget @@ -449,7 +479,7 @@ void QWidgetWindow::handleFocusInEvent(QFocusEvent *e) void QWidgetWindow::handleNonClientAreaMouseEvent(QMouseEvent *e) { - QApplication::sendSpontaneousEvent(m_widget, e); + QApplication::forwardEvent(m_widget, e); } void QWidgetWindow::handleMouseEvent(QMouseEvent *event) @@ -506,22 +536,25 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event) // Prevent negative mouse position on enter event - this event // should be properly handled in "handleEnterLeaveEvent()". if (receiverMapped.x() >= 0 && receiverMapped.y() >= 0) { - QApplicationPrivate::dispatchEnterLeave(receiver, Q_NULLPTR, event->screenPos()); + QApplicationPrivate::dispatchEnterLeave(receiver, nullptr, event->screenPos()); qt_last_mouse_receiver = receiver; } } else { - QApplicationPrivate::dispatchEnterLeave(Q_NULLPTR, qt_last_mouse_receiver, event->screenPos()); + QApplicationPrivate::dispatchEnterLeave(nullptr, qt_last_mouse_receiver, event->screenPos()); qt_last_mouse_receiver = receiver; receiver = activePopupWidget; } } #endif - - QMouseEvent e(event->type(), widgetPos, event->windowPos(), event->screenPos(), - event->button(), event->buttons(), event->modifiers(), event->source()); - e.setTimestamp(event->timestamp()); - QApplicationPrivate::sendMouseEvent(receiver, &e, receiver, receiver->window(), &qt_button_down, qt_last_mouse_receiver); - qt_last_mouse_receiver = receiver; + if ((event->type() != QEvent::MouseButtonPress) + || !(event->flags().testFlag(Qt::MouseEventCreatedDoubleClick))) { + + QMouseEvent e(event->type(), widgetPos, event->windowPos(), event->screenPos(), + event->button(), event->buttons(), event->modifiers(), event->source()); + e.setTimestamp(event->timestamp()); + QApplicationPrivate::sendMouseEvent(receiver, &e, receiver, receiver->window(), &qt_button_down, qt_last_mouse_receiver); + qt_last_mouse_receiver = receiver; + } } else { // close disabled popups when a mouse button is pressed or released switch (event->type()) { @@ -574,13 +607,13 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event) } else if (event->type() == contextMenuTrigger && event->button() == Qt::RightButton && (openPopupCount == oldOpenPopupCount)) { - QWidget *popupEvent = activePopupWidget; + QWidget *receiver = activePopupWidget; if (qt_button_down) - popupEvent = qt_button_down; + receiver = qt_button_down; else if(popupChild) - popupEvent = popupChild; + receiver = popupChild; QContextMenuEvent e(QContextMenuEvent::Mouse, mapped, event->globalPos(), event->modifiers()); - QApplication::sendSpontaneousEvent(popupEvent, &e); + QApplication::forwardEvent(receiver, &e, event); } #else Q_UNUSED(contextMenuTrigger) @@ -611,12 +644,9 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event) QWidget *receiver = QApplicationPrivate::pickMouseReceiver(m_widget, event->windowPos().toPoint(), &mapped, event->type(), event->buttons(), qt_button_down, widget); - - if (!receiver) { - if (event->type() == QEvent::MouseButtonRelease) - QApplicationPrivate::mouse_buttons &= ~event->button(); + if (!receiver) return; - } + if ((event->type() != QEvent::MouseButtonPress) || !(event->flags().testFlag(Qt::MouseEventCreatedDoubleClick))) { @@ -633,7 +663,7 @@ void QWidgetWindow::handleMouseEvent(QMouseEvent *event) if (event->type() == contextMenuTrigger && event->button() == Qt::RightButton && m_widget->rect().contains(event->pos())) { QContextMenuEvent e(QContextMenuEvent::Mouse, mapped, event->globalPos(), event->modifiers()); - QGuiApplication::sendSpontaneousEvent(receiver, &e); + QGuiApplication::forwardEvent(receiver, &e, event); } #endif } @@ -665,7 +695,7 @@ void QWidgetWindow::handleKeyEvent(QKeyEvent *event) } if (!receiver) receiver = focusObject(); - QGuiApplication::sendSpontaneousEvent(receiver, event); + QGuiApplication::forwardEvent(receiver, event); } bool QWidgetWindow::updateSize() @@ -737,8 +767,6 @@ void QWidgetWindow::repaintWindow() QWidgetBackingStore::UpdateNow, QWidgetBackingStore::BufferInvalid); } -Qt::WindowState effectiveState(Qt::WindowStates state); - // Store normal geometry used for saving application settings. void QWidgetWindow::updateNormalGeometry() { @@ -749,7 +777,7 @@ void QWidgetWindow::updateNormalGeometry() QRect normalGeometry; if (const QPlatformWindow *pw = handle()) normalGeometry = QHighDpi::fromNativePixels(pw->normalGeometry(), this); - if (!normalGeometry.isValid() && effectiveState(m_widget->windowState()) == Qt::WindowNoState) + if (!normalGeometry.isValid() && !(m_widget->windowState() & ~Qt::WindowActive)) normalGeometry = m_widget->geometry(); if (normalGeometry.isValid()) tle->normalGeometry = normalGeometry; @@ -758,7 +786,7 @@ void QWidgetWindow::updateNormalGeometry() void QWidgetWindow::handleMoveEvent(QMoveEvent *event) { if (updatePos()) - QGuiApplication::sendSpontaneousEvent(m_widget, event); + QGuiApplication::forwardEvent(m_widget, event); } void QWidgetWindow::handleResizeEvent(QResizeEvent *event) @@ -766,7 +794,7 @@ void QWidgetWindow::handleResizeEvent(QResizeEvent *event) QSize oldSize = m_widget->data->crect.size(); if (updateSize()) { - QGuiApplication::sendSpontaneousEvent(m_widget, event); + QGuiApplication::forwardEvent(m_widget, event); if (m_widget->d_func()->paintOnScreen()) { QRegion updateRegion(geometry()); @@ -812,7 +840,7 @@ void QWidgetWindow::handleWheelEvent(QWheelEvent *event) QPoint mapped = widget->mapFrom(rootWidget, pos); QWheelEvent translated(mapped, event->globalPos(), event->pixelDelta(), event->angleDelta(), event->delta(), event->orientation(), event->buttons(), event->modifiers(), event->phase(), event->source(), event->inverted()); - QGuiApplication::sendSpontaneousEvent(widget, &translated); + QGuiApplication::forwardEvent(widget, &translated, event); } #endif // QT_CONFIG(wheelevent) @@ -839,7 +867,7 @@ void QWidgetWindow::handleDragEnterMoveEvent(QDragMoveEvent *event) translated.accept(); translated.setDropAction(event->dropAction()); } - QGuiApplication::sendSpontaneousEvent(widget, &translated); + QGuiApplication::forwardEvent(widget, &translated, event); if (translated.isAccepted()) { event->accept(); } else { @@ -851,7 +879,7 @@ void QWidgetWindow::handleDragEnterMoveEvent(QDragMoveEvent *event) // Target widget changed: Send DragLeave to previous, DragEnter to new if there is any if (m_dragTarget.data()) { QDragLeaveEvent le; - QGuiApplication::sendSpontaneousEvent(m_dragTarget.data(), &le); + QGuiApplication::forwardEvent(m_dragTarget.data(), &le, event); m_dragTarget = 0; } if (!widget) { @@ -861,7 +889,7 @@ void QWidgetWindow::handleDragEnterMoveEvent(QDragMoveEvent *event) m_dragTarget = widget; const QPoint mapped = widget->mapFromGlobal(m_widget->mapToGlobal(event->pos())); QDragEnterEvent translated(mapped, event->possibleActions(), event->mimeData(), event->mouseButtons(), event->keyboardModifiers()); - QGuiApplication::sendSpontaneousEvent(widget, &translated); + QGuiApplication::forwardEvent(widget, &translated, event); if (translated.isAccepted()) { event->accept(); } else { @@ -873,7 +901,7 @@ void QWidgetWindow::handleDragEnterMoveEvent(QDragMoveEvent *event) void QWidgetWindow::handleDragLeaveEvent(QDragLeaveEvent *event) { if (m_dragTarget) - QGuiApplication::sendSpontaneousEvent(m_dragTarget.data(), event); + QGuiApplication::forwardEvent(m_dragTarget.data(), event); m_dragTarget = 0; } @@ -886,7 +914,7 @@ void QWidgetWindow::handleDropEvent(QDropEvent *event) } const QPoint mapped = m_dragTarget.data()->mapFromGlobal(m_widget->mapToGlobal(event->pos())); QDropEvent translated(mapped, event->possibleActions(), event->mimeData(), event->mouseButtons(), event->keyboardModifiers()); - QGuiApplication::sendSpontaneousEvent(m_dragTarget.data(), &translated); + QGuiApplication::forwardEvent(m_dragTarget.data(), &translated, event); if (translated.isAccepted()) event->accept(); event->setDropAction(translated.dropAction()); @@ -909,7 +937,7 @@ void QWidgetWindow::handleExposeEvent(QExposeEvent *event) // ... and they haven't been shown by this function yet - show it. wPriv->showChildren(true); QShowEvent showEvent; - QCoreApplication::sendSpontaneousEvent(m_widget, &showEvent); + QCoreApplication::forwardEvent(m_widget, &showEvent, event); wPriv->childrenShownByExpose = true; } } else { @@ -921,7 +949,7 @@ void QWidgetWindow::handleExposeEvent(QExposeEvent *event) // and then, the QPA can send next expose event with null exposed region (not exposed). wPriv->hideChildren(true); QHideEvent hideEvent; - QCoreApplication::sendSpontaneousEvent(m_widget, &hideEvent); + QCoreApplication::forwardEvent(m_widget, &hideEvent, event); wPriv->childrenShownByExpose = false; } } @@ -941,30 +969,18 @@ void QWidgetWindow::handleWindowStateChangedEvent(QWindowStateChangeEvent *event // QWindow does currently not know 'active'. Qt::WindowStates eventState = event->oldState(); Qt::WindowStates widgetState = m_widget->windowState(); + Qt::WindowStates windowState = windowStates(); if (widgetState & Qt::WindowActive) eventState |= Qt::WindowActive; // Determine the new widget state, remember maximized/full screen // during minimized. - switch (windowState()) { - case Qt::WindowNoState: - widgetState &= ~(Qt::WindowMinimized | Qt::WindowMaximized | Qt::WindowFullScreen); - break; - case Qt::WindowMinimized: + if (windowState & Qt::WindowMinimized) { widgetState |= Qt::WindowMinimized; - break; - case Qt::WindowMaximized: - updateNormalGeometry(); - widgetState |= Qt::WindowMaximized; - widgetState &= ~(Qt::WindowMinimized | Qt::WindowFullScreen); - break; - case Qt::WindowFullScreen: - updateNormalGeometry(); - widgetState |= Qt::WindowFullScreen; - widgetState &= ~(Qt::WindowMinimized); - break; - case Qt::WindowActive: // Not handled by QWindow - break; + } else { + widgetState = windowState | (widgetState & Qt::WindowActive); + if (windowState) // Maximized or FullScreen + updateNormalGeometry(); } // Sent event if the state changed (that is, it is not triggered by @@ -972,7 +988,7 @@ void QWidgetWindow::handleWindowStateChangedEvent(QWindowStateChangeEvent *event if (widgetState != Qt::WindowStates::Int(m_widget->data->window_state)) { m_widget->data->window_state = uint(widgetState); QWindowStateChangeEvent widgetEvent(eventState); - QGuiApplication::sendSpontaneousEvent(m_widget, &widgetEvent); + QGuiApplication::forwardEvent(m_widget, &widgetEvent, event); } } @@ -1004,7 +1020,7 @@ void QWidgetWindow::handleTabletEvent(QTabletEvent *event) event->pressure(), event->xTilt(), event->yTilt(), event->tangentialPressure(), event->rotation(), event->z(), event->modifiers(), event->uniqueId(), event->button(), event->buttons()); ev.setTimestamp(event->timestamp()); - QGuiApplication::sendSpontaneousEvent(widget, &ev); + QGuiApplication::forwardEvent(widget, &ev, event); event->setAccepted(ev.isAccepted()); } @@ -1028,7 +1044,7 @@ void QWidgetWindow::handleGestureEvent(QNativeGestureEvent *e) if (!receiver) receiver = m_widget; // last resort - QApplication::sendSpontaneousEvent(receiver, e); + QApplication::forwardEvent(receiver, e); } #endif // QT_NO_GESTURES @@ -1056,7 +1072,7 @@ void QWidgetWindow::handleContextMenuEvent(QContextMenuEvent *e) QPoint pos = fw->inputMethodQuery(Qt::ImMicroFocus).toRect().center(); QContextMenuEvent widgetEvent(QContextMenuEvent::Keyboard, pos, fw->mapToGlobal(pos), e->modifiers()); - QGuiApplication::sendSpontaneousEvent(fw, &widgetEvent); + QGuiApplication::forwardEvent(fw, &widgetEvent, e); } } #endif // QT_NO_CONTEXTMENU diff --git a/src/widgets/kernel/qwidgetwindow_p.h b/src/widgets/kernel/qwidgetwindow_p.h index 50a2cfd57c..d0f1d55c2a 100644 --- a/src/widgets/kernel/qwidgetwindow_p.h +++ b/src/widgets/kernel/qwidgetwindow_p.h @@ -63,22 +63,25 @@ QT_BEGIN_NAMESPACE class QCloseEvent; class QMoveEvent; +class QWidgetWindowPrivate; class QWidgetWindow : public QWindow { Q_OBJECT + Q_DECLARE_PRIVATE(QWidgetWindow) public: QWidgetWindow(QWidget *widget); ~QWidgetWindow(); QWidget *widget() const { return m_widget; } #ifndef QT_NO_ACCESSIBILITY - QAccessibleInterface *accessibleRoot() const Q_DECL_OVERRIDE; + QAccessibleInterface *accessibleRoot() const override; #endif - QObject *focusObject() const Q_DECL_OVERRIDE; + QObject *focusObject() const override; + void setNativeWindowVisibility(bool visible); protected: - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; void handleCloseEvent(QCloseEvent *); void handleEnterLeaveEvent(QEvent *); @@ -99,7 +102,7 @@ protected: #endif void handleExposeEvent(QExposeEvent *); void handleWindowStateChangedEvent(QWindowStateChangeEvent *event); - bool nativeEvent(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE; + bool nativeEvent(const QByteArray &eventType, void *message, long *result) override; #if QT_CONFIG(tabletevent) void handleTabletEvent(QTabletEvent *); #endif diff --git a/src/widgets/kernel/qwindowcontainer.cpp b/src/widgets/kernel/qwindowcontainer.cpp index 56114350d2..d388327687 100644 --- a/src/widgets/kernel/qwindowcontainer.cpp +++ b/src/widgets/kernel/qwindowcontainer.cpp @@ -341,6 +341,19 @@ bool QWindowContainer::event(QEvent *e) e->accept(); return true; #endif + + case QEvent::Paint: + { + static bool needsPunch = !QGuiApplicationPrivate::platformIntegration()->hasCapability( + QPlatformIntegration::TopStackedNativeChildWindows); + if (needsPunch) { + QPainter p(this); + p.setCompositionMode(QPainter::CompositionMode_Source); + p.fillRect(rect(), Qt::transparent); + } + break; + } + default: break; } diff --git a/src/widgets/kernel/qwindowcontainer_p.h b/src/widgets/kernel/qwindowcontainer_p.h index 1d838c8dd6..a8754232a8 100644 --- a/src/widgets/kernel/qwindowcontainer_p.h +++ b/src/widgets/kernel/qwindowcontainer_p.h @@ -75,7 +75,7 @@ public: static void parentWasLowered(QWidget *parent); protected: - bool event(QEvent *ev) Q_DECL_OVERRIDE; + bool event(QEvent *ev) override; private slots: void focusWindowChanged(QWindow *focusWindow); diff --git a/src/widgets/kernel/win.pri b/src/widgets/kernel/win.pri index 7cef2d14a8..f6877b02db 100644 --- a/src/widgets/kernel/win.pri +++ b/src/widgets/kernel/win.pri @@ -3,5 +3,3 @@ INCLUDEPATH += ../3rdparty/wintab !winrt: LIBS_PRIVATE *= -lshell32 -luxtheme -ldwmapi -# Override MinGW's definition in _mingw.h -mingw: DEFINES += WINVER=0x600 _WIN32_WINNT=0x0600 |