1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Windows: Don't re-apply application badge if one has not been set

Browse Source 
We need to re-apply the application badge when the color scheme changes;
when a task bar button is being created for the fist time; or after Explorer
has crashed and re-started.

But we should only do that if the user has set an application badge
via our APIs. Otherwise we might end up clearing an existing badge
that was set via the native APIs directly.

Fixes: QTBUG-118117
Pick-to: 6.5
Change-Id: I1f1fecba44c118d4e3f7ef4119139c3ebd23f047
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit 8f2828683e2ac44a282e8f061de1c76925abcec1)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Tor Arne Vestbø 2023-10-17 16:06:19 +02:00 committed by Qt Cherry-pick Bot
parent 90c65ca197
commit 6e2f311873
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/platforms/windows/qwindowsintegration.cpp
View File

@ -785,7 +785,8 @@ void QWindowsIntegration::updateApplicationBadge()
// to a task bar button being created for the fist time or after
// Explorer had crashed and re-started. In any case, re-apply the
// badge so that everything is up to date.
setApplicationBadge(m_applicationBadgeNumber);
if (m_applicationBadgeNumber)
setApplicationBadge(m_applicationBadgeNumber);
}
#if QT_CONFIG(vulkan)