AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

macOS: Handle more NSUnderlineStyles during text composition

Browse Source 
Pick-to: 6.2
Change-Id: I2a6cf612506d19736eab007f687a03f6d6595b62
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
This commit is contained in:
Tor Arne Vestbø 2021-08-20 12:59:40 +02:00
parent fa6e490374
commit b963888b1c
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/platforms/cocoa/qnsview_complextext.mm
View File

@ -150,8 +150,28 @@
qCDebug(lcQpaKeys) << "Decorating range" << range << "based on" << attributes;
QTextCharFormat format;
if (NSNumber *underlineStyle = attributes[NSUnderlineStyleAttributeName])
format.setFontUnderline(true); // FIXME: Support all NSUnderlineStyles
if (NSNumber *underlineStyle = attributes[NSUnderlineStyleAttributeName]) {
format.setFontUnderline(true);
NSUnderlineStyle style = underlineStyle.integerValue;
if (style & NSUnderlineStylePatternDot)
format.setUnderlineStyle(QTextCharFormat::DotLine);
else if (style & NSUnderlineStylePatternDash)
format.setUnderlineStyle(QTextCharFormat::DashUnderline);
else if (style & NSUnderlineStylePatternDashDot)
format.setUnderlineStyle(QTextCharFormat::DashDotLine);
if (style & NSUnderlineStylePatternDashDotDot)
format.setUnderlineStyle(QTextCharFormat::DashDotDotLine);
else
format.setUnderlineStyle(QTextCharFormat::SingleUnderline);
// Unfortunately QTextCharFormat::UnderlineStyle does not distinguish
// between NSUnderlineStyle{Single,Thick,Double}, which is used by CJK
// input methods to highlight the selected clause segments, so we fake
// it using QTextCharFormat::WaveUnderline.
if ((style & NSUnderlineStyleThick) == NSUnderlineStyleThick
|| (style & NSUnderlineStyleDouble) == NSUnderlineStyleDouble)
format.setUnderlineStyle(QTextCharFormat::WaveUnderline);
}
if (NSColor *underlineColor = attributes[NSUnderlineColorAttributeName])
format.setUnderlineColor(qt_mac_toQColor(underlineColor));
if (NSColor *foregroundColor = attributes[NSForegroundColorAttributeName])