1 |
commit: c3581c4fe51dcd2ceadc1977a135fa78050b9213 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jan 30 16:56:46 2019 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jan 30 16:56:46 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3581c4f |
7 |
|
8 |
kde-frameworks/kwidgetsaddons: No light font styles for headings |
9 |
|
10 |
Fixes a readability regression in 5.53.0. |
11 |
|
12 |
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=402730 |
13 |
Package-Manager: Portage-2.3.59, Repoman-2.3.12 |
14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
15 |
|
16 |
...addons-5.54.0-no-light-fontstyle-headings.patch | 88 ++++++++++++++++++++++ |
17 |
.../kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild | 28 +++++++ |
18 |
2 files changed, 116 insertions(+) |
19 |
|
20 |
diff --git a/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch b/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..38c89728b52 |
23 |
--- /dev/null |
24 |
+++ b/kde-frameworks/kwidgetsaddons/files/kwidgetsaddons-5.54.0-no-light-fontstyle-headings.patch |
25 |
@@ -0,0 +1,88 @@ |
26 |
+From dc901a1f0b5f6621bfa1c23e33dcfdf6246e7cb1 Mon Sep 17 00:00:00 2001 |
27 |
+From: =?UTF-8?q?Kre=C5=A1imir=20=C4=8Cohar?= <kcohar@×××××.com> |
28 |
+Date: Thu, 10 Jan 2019 09:19:33 -0700 |
29 |
+Subject: [KWidgetsAddons] Do not use light font styles for headings (3/3) |
30 |
+ |
31 |
+Summary: |
32 |
+This patch brings back regular font styles for headings to KTitleWidget for the sake of consistency with QML and Kirigami, where they were also reintroduced in favor of better legibility. |
33 |
+ |
34 |
+CCBUG: 402730 |
35 |
+ |
36 |
+FIXED-IN: 5.54 |
37 |
+ |
38 |
+Test Plan: |
39 |
+Before: |
40 |
+{F6520054} |
41 |
+After: |
42 |
+{F6520058} |
43 |
+ |
44 |
+Reviewers: ngraham, #frameworks, #vdg, #plasma |
45 |
+ |
46 |
+Reviewed By: ngraham, #vdg |
47 |
+ |
48 |
+Subscribers: cfeck, filipf, kde-frameworks-devel |
49 |
+ |
50 |
+Tags: #frameworks |
51 |
+ |
52 |
+Differential Revision: https://phabricator.kde.org/D17907 |
53 |
+--- |
54 |
+ src/ktitlewidget.cpp | 29 ----------------------------- |
55 |
+ 1 file changed, 29 deletions(-) |
56 |
+ |
57 |
+diff --git a/src/ktitlewidget.cpp b/src/ktitlewidget.cpp |
58 |
+index 7a34bc2..d8b0517 100644 |
59 |
+--- a/src/ktitlewidget.cpp |
60 |
++++ b/src/ktitlewidget.cpp |
61 |
+@@ -213,16 +213,6 @@ void KTitleWidget::changeEvent(QEvent *e) |
62 |
+ if (e->type() == QEvent::PaletteChange || e->type() == QEvent::FontChange |
63 |
+ || e->type() == QEvent::ApplicationFontChange) { |
64 |
+ d->textLabel->setStyleSheet(d->textStyleSheet()); |
65 |
+- //Qt stylesheet doesn't support lighter font-weight |
66 |
+- QFont font(d->textLabel->font()); |
67 |
+- if (d->level <= 4) { |
68 |
+- font.setWeight(QFont::Light); |
69 |
+- font.setStyleName(QStringLiteral("Light")); |
70 |
+- } else { |
71 |
+- font.setWeight(QFont::Normal); |
72 |
+- font.setStyleName(QStringLiteral("Regular")); |
73 |
+- } |
74 |
+- d->textLabel->setFont(font); |
75 |
+ d->commentLabel->setStyleSheet(d->commentStyleSheet()); |
76 |
+ } |
77 |
+ } |
78 |
+@@ -233,16 +223,6 @@ void KTitleWidget::setText(const QString &text, Qt::Alignment alignment) |
79 |
+ |
80 |
+ if (!Qt::mightBeRichText(text)) { |
81 |
+ d->textLabel->setStyleSheet(d->textStyleSheet()); |
82 |
+- //Qt stylesheet doesn't support lighter font-weight |
83 |
+- QFont font(d->textLabel->font()); |
84 |
+- if (d->level <= 4) { |
85 |
+- font.setWeight(QFont::Light); |
86 |
+- font.setStyleName(QStringLiteral("Light")); |
87 |
+- } else { |
88 |
+- font.setWeight(QFont::Normal); |
89 |
+- font.setStyleName(QStringLiteral("Regular")); |
90 |
+- } |
91 |
+- d->textLabel->setFont(font); |
92 |
+ } |
93 |
+ |
94 |
+ d->textLabel->setText(text); |
95 |
+@@ -259,15 +239,6 @@ void KTitleWidget::setLevel(int level) |
96 |
+ d->level = level; |
97 |
+ |
98 |
+ d->textLabel->setStyleSheet(d->textStyleSheet()); |
99 |
+- //Qt stylesheet doesn't support lighter font-weight |
100 |
+- QFont font(d->textLabel->font()); |
101 |
+- if (d->level <= 4) { |
102 |
+- font.setWeight(QFont::Light); |
103 |
+- font.setStyleName(QStringLiteral("Light")); |
104 |
+- } else { |
105 |
+- font.setWeight(QFont::Normal); |
106 |
+- font.setStyleName(QStringLiteral("Regular")); |
107 |
+- } |
108 |
+ } |
109 |
+ |
110 |
+ int KTitleWidget::level() |
111 |
+-- |
112 |
+cgit v1.1 |
113 |
+ |
114 |
|
115 |
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild |
116 |
new file mode 100644 |
117 |
index 00000000000..274e1794131 |
118 |
--- /dev/null |
119 |
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.54.0-r1.ebuild |
120 |
@@ -0,0 +1,28 @@ |
121 |
+# Copyright 1999-2019 Gentoo Authors |
122 |
+# Distributed under the terms of the GNU General Public License v2 |
123 |
+ |
124 |
+EAPI=6 |
125 |
+ |
126 |
+VIRTUALX_REQUIRED="test" |
127 |
+inherit kde5 |
128 |
+ |
129 |
+DESCRIPTION="An assortment of high-level widgets for common tasks" |
130 |
+LICENSE="LGPL-2.1+" |
131 |
+KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
132 |
+IUSE="nls" |
133 |
+ |
134 |
+RDEPEND=" |
135 |
+ $(add_qt_dep qtgui) |
136 |
+ $(add_qt_dep qtwidgets) |
137 |
+" |
138 |
+DEPEND="${RDEPEND} |
139 |
+ nls? ( $(add_qt_dep linguist-tools) ) |
140 |
+" |
141 |
+ |
142 |
+PATCHES=( "${FILESDIR}/${P}-no-light-fontstyle-headings.patch" ) |
143 |
+ |
144 |
+src_test() { |
145 |
+ # bug 650216, 653186 |
146 |
+ local myctestargs=( -E "(kdatecomboboxtest|ktooltipwidgettest)" ) |
147 |
+ kde5_src_test |
148 |
+} |