From 39798bffb1398d6b75a067ff5552a63ea6b182f7 Mon Sep 17 00:00:00 2001 From: David Edmundson Date: Wed, 19 Feb 2020 08:26:06 +0000 Subject: [PATCH] [plastik] Disable problematic text hints Summary: Use of "style: Text.Raised" combined with UTF-8 emoji characters currently crashes deep in font rendering code. A report has been submitted upstream: https://bugreports.qt.io/browse/QTBUG-82311 Given this crash is surprisingly common, this patch removes the text shadow. I normally would be against removing features, but this was a subtle effect anyway and frankly just made things look blurry. I doubt it'll be missed. BUG: 417699 BUG: 413179 Test Plan: Made unit test for the crash in qmlscene Fixed the issue there Reviewers: #kwin, zzag Reviewed By: #kwin, zzag Subscribers: kwin Tags: #kwin Differential Revision: https://phabricator.kde.org/D27488 --- .../themes/plastik/package/contents/config/main.xml | 3 --- .../themes/plastik/package/contents/ui/config.ui | 11 ----------- .../themes/plastik/package/contents/ui/main.qml | 4 ---- 3 files changed, 18 deletions(-) diff --git a/plugins/kdecorations/aurorae/themes/plastik/package/contents/config/main.xml b/plugins/kdecorations/aurorae/themes/plastik/package/contents/config/main.xml index 99f1126561..2054553b5e 100644 --- a/plugins/kdecorations/aurorae/themes/plastik/package/contents/config/main.xml +++ b/plugins/kdecorations/aurorae/themes/plastik/package/contents/config/main.xml @@ -18,9 +18,6 @@ true - - true - true diff --git a/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/config.ui b/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/config.ui index b2670db3d1..8052111599 100644 --- a/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/config.ui +++ b/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/config.ui @@ -60,16 +60,6 @@ - - - - Check this option if you want the titlebar text to have a 3D look with a shadow behind it. - - - Use shadowed &text - - - @@ -92,7 +82,6 @@ kcfg_animateButtons - kcfg_titleShadow diff --git a/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/main.qml b/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/main.qml index 3bbc2f830f..0b1a52e613 100644 --- a/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/main.qml +++ b/plugins/kdecorations/aurorae/themes/plastik/package/contents/ui/main.qml @@ -76,7 +76,6 @@ Decoration { root.titleAlignment = Text.AlignLeft; } root.animateButtons = decoration.readConfig("animateButtons", true); - root.titleShadow = decoration.readConfig("titleShadow", true); if (decoration.animationsSupported) { root.animationDuration = 150; root.animateButtons = false; @@ -96,7 +95,6 @@ Decoration { // set by readConfig after Component completed, ensures that buttons do not flicker property int animationDuration: 0 property bool animateButtons: true - property bool titleShadow: true Behavior on titleBarColor { ColorAnimation { duration: root.animationDuration @@ -276,8 +274,6 @@ Decoration { } text: decoration.client.caption font: options.titleFont - style: root.titleShadow ? Text.Raised : Text.Normal - styleColor: colorHelper.shade(color, ColorHelper.ShadowShade) elide: Text.ElideMiddle renderType: Text.NativeRendering }