From 7a5d7e8440a1e4beec49b751d0ecacdf55aa45d5 Mon Sep 17 00:00:00 2001 From: JiDe Zhang Date: Mon, 7 Mar 2022 18:18:27 +0800 Subject: Optimize the QPalette::resolve from the other palette If all the palette's colors are resolved, nothing needs to be done in QPalette::resolve(const QPalette &other). Change-Id: I1573cfa5b5cd1e7eb15f3242aff6ab92e9f8c84b Reviewed-by: Qt CI Bot Reviewed-by: Volker Hilsheimer --- src/gui/kernel/qpalette.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'src/gui/kernel/qpalette.cpp') diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index 22ba5f3bcd3..5a0bad91599 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -921,6 +921,17 @@ qint64 QPalette::cacheKey() const return (((qint64) d->ser_no) << 32) | ((qint64) (d->detach_no)); } +static constexpr QPalette::ResolveMask allResolveMask() +{ + QPalette::ResolveMask mask = {0}; + for (int role = 0; role < int(QPalette::NColorRoles); ++role) { + for (int grp = 0; grp < int(QPalette::NColorGroups); ++grp) { + mask |= (QPalette::ResolveMask(1) << bitPosition(QPalette::ColorGroup(grp), QPalette::ColorRole(role))); + } + } + return mask; +} + /*! Returns a new QPalette that is a union of this instance and \a other. Color roles set in this instance take precedence. @@ -934,6 +945,9 @@ QPalette QPalette::resolve(const QPalette &other) const return o; } + if (d->resolveMask == allResolveMask()) + return *this; + QPalette palette(*this); palette.detach(); -- cgit v1.2.3