From f3bcce4d2d5eb2d329f1a607bd11921d4e507d08 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Sat, 5 Oct 2024 20:00:03 +0200
Subject: [PATCH] Windows11Style: don't use deprecated glyphs

The glyphs for Segoe Fluent/MDL2 in the range 0xE000 - 0xE5FF are marked
as legacy and deprecated. Therefore replace them with the recent glyphs.
 - 0xE001 -> 0xE73E (CheckMark)
 - 0xE010 -> 0xE96D (ChevronUpSmall)
 - 0xE011 -> 0xE96E (ChevronDownSmall)
 - 0xE013 -> 0xE974 (ChevronRightMed)
 - 0xE018 -> 0xE70E (ChevronUp)
 - 0xE019 -> 0xE70D (ChevronDown)
 - 0xE108 -> 0xE73C (CheckboxIndeterminate)

Change-Id: I1251230fcd49c2a77a569ed97b9108597554c7ca
Reviewed-by: Wladimir Leuschner <wladimir.leuschner@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
(cherry picked from commit b44ecf0237e0cca2beb7c5e6600afd252f7e51c7)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 .../styles/modernwindows/qwindows11style.cpp   | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/plugins/styles/modernwindows/qwindows11style.cpp b/src/plugins/styles/modernwindows/qwindows11style.cpp
index ed1bcde4cf2..886e0e5f94c 100644
--- a/src/plugins/styles/modernwindows/qwindows11style.cpp
+++ b/src/plugins/styles/modernwindows/qwindows11style.cpp
@@ -286,7 +286,7 @@ void QWindows11Style::drawComplexControl(ComplexControl control, const QStyleOpt
                 painter->setFont(assetFont);
                 painter->setPen(sb->palette.buttonText().color());
                 painter->setBrush(Qt::NoBrush);
-                const auto str = isUp ? QStringLiteral(u"\uE018") : QStringLiteral(u"\uE019");
+                const auto str = isUp ? QStringLiteral(u"\uE70E") : QStringLiteral(u"\uE70D");
                 painter->drawText(rect, str, Qt::AlignVCenter | Qt::AlignHCenter);
             };
             if (sub & SC_SpinBoxUp) drawUpDown(SC_SpinBoxUp);
@@ -456,7 +456,7 @@ void QWindows11Style::drawComplexControl(ComplexControl control, const QStyleOpt
                 QRectF rect = proxy()->subControlRect(CC_ComboBox, option, SC_ComboBoxArrow, widget).adjusted(-4, 0, -4, 1);
                 painter->setFont(assetFont);
                 painter->setPen(combobox->palette.text().color());
-                painter->drawText(rect,"\uE019", Qt::AlignVCenter | Qt::AlignHCenter);
+                painter->drawText(rect,"\uE70D", Qt::AlignVCenter | Qt::AlignHCenter);
             }
             if (combobox->editable) {
                 QColor lineColor = state & State_HasFocus ? option->palette.accent().color() : QColor(0,0,0);
@@ -671,7 +671,7 @@ void QWindows11Style::drawComplexControl(ComplexControl control, const QStyleOpt
                     bool hover = (titlebar->activeSubControls & SC_TitleBarShadeButton) && (titlebar->state & State_MouseOver);
                     if (hover)
                         painter->fillRect(shadeButtonRect,WINUI3Colors[colorSchemeIndex][subtleHighlightColor]);
-                    const QString textToDraw("\uE010");
+                    const QString textToDraw("\uE96D");
                     painter->setPen(QPen(titlebar->palette.text().color()));
                     painter->setFont(buttonFont);
                     painter->drawText(shadeButtonRect, Qt::AlignVCenter | Qt::AlignHCenter, textToDraw);
@@ -685,7 +685,7 @@ void QWindows11Style::drawComplexControl(ComplexControl control, const QStyleOpt
                     bool hover = (titlebar->activeSubControls & SC_TitleBarUnshadeButton) && (titlebar->state & State_MouseOver);
                     if (hover)
                         painter->fillRect(unshadeButtonRect,WINUI3Colors[colorSchemeIndex][subtleHighlightColor]);
-                    const QString textToDraw("\uE011");
+                    const QString textToDraw("\uE96E");
                     painter->setPen(QPen(titlebar->palette.text().color()));
                     painter->setFont(buttonFont);
                     painter->drawText(unshadeButtonRect, Qt::AlignVCenter | Qt::AlignHCenter, textToDraw);
@@ -831,7 +831,7 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
             rect.moveCenter(center);
 
             float clipWidth = animation != nullptr ? animation->currentValue() : 1.0f;
-            QRectF clipRect = fm.boundingRect("\uE001");
+            QRectF clipRect = fm.boundingRect("\uE73E");
             clipRect.moveCenter(center);
             clipRect.setLeft(rect.x() + (rect.width() - clipRect.width()) / 2.0);
             clipRect.setWidth(clipWidth * clipRect.width());
@@ -854,9 +854,9 @@ void QWindows11Style::drawPrimitive(PrimitiveElement element, const QStyleOption
             painter->setPen(option->palette.highlightedText().color());
             painter->setBrush(option->palette.highlightedText().color());
             if (option->state & State_On)
-                painter->drawText(clipRect, Qt::AlignVCenter | Qt::AlignLeft,"\uE001");
+                painter->drawText(clipRect, Qt::AlignVCenter | Qt::AlignLeft,"\uE73E");
             else if (option->state & State_NoChange)
-                painter->drawText(rect, Qt::AlignVCenter | Qt::AlignHCenter,"\uE108");
+                painter->drawText(rect, Qt::AlignVCenter | Qt::AlignHCenter,"\uE73C");
         }
         break;
 
@@ -1577,7 +1577,7 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op
                         text_flags |= Qt::TextHideMnemonic;
                     text_flags |= Qt::AlignLeft;
 
-                    const QString textToDraw("\uE001");
+                    const QString textToDraw("\uE73E");
                     painter->setPen(option->palette.text().color());
                     painter->drawText(vTextRect, text_flags, textToDraw);
                     painter->restore();
@@ -1641,7 +1641,7 @@ void QWindows11Style::drawControl(ControlElement element, const QStyleOption *op
                 if (!proxy()->styleHint(SH_UnderlineShortcut, menuitem, widget))
                     text_flags |= Qt::TextHideMnemonic;
                 text_flags |= Qt::AlignLeft;
-                const QString textToDraw("\uE013");
+                const QString textToDraw("\uE974");
                 painter->setPen(option->palette.text().color());
                 painter->drawText(vSubMenuRect, text_flags, textToDraw);
                 painter->restore();