megacoffee.net Gentoo overlay - legacy mirror

We have moved to Git. This repository is only provided for compatibility with old installations. Learn how to migrate your installation here.

annotate kde-plasma/breeze/files/5.27.4_breeze_mr292_outline_intensity_setting.patch @ 250:37508d4f31c8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[sync] imported 18f98a6..d0858fb from upstream commit d0858fbd09faf50138d7ad3a4559ba1f3e2b930c Author: Daniel Neugebauer <dneuge@energiequant.de> Date: Thu Apr 27 12:49:23 2023 +0200 kde-plasma/breeze: configurable outline (MR 292) via patch_outline Source: https://invent.kde.org/plasma/breeze/-/merge_requests/292 commit ef044cae13e73c5f9dd2d078a4879df3987cc69a Author: Daniel Neugebauer <dneuge@energiequant.de> Date: Thu Apr 27 12:26:14 2023 +0200 kde-plasma/breeze-5.27.4 copied from main Gentoo repository
author Migration Sync <gentoo-overlay@megacoffee.net>
date Thu, 27 Apr 2023 11:00:03 +0000
parents
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
250
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
1 From a77b1e00416d7d946539a3c2335b42e8c81cbe54 Mon Sep 17 00:00:00 2001
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
2 From: Akseli Lahtinen <akselmo@akselmo.dev>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
3 Date: Sun, 26 Feb 2023 18:37:54 +0200
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
4 Subject: [PATCH 1/7] add m_outlineIntensity, check for outline intensity
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
5 before drawing
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
6
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
7 ---
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
8 kdecoration/breezedecoration.cpp | 62 ++++++++++++++++----------------
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
9 kdecoration/breezedecoration.h | 2 ++
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
10 2 files changed, 34 insertions(+), 30 deletions(-)
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
11
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
12 diff --git a/kdecoration/breezedecoration.cpp b/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
13 index cc5bb75d7..699221b79 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
14 --- a/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
15 +++ b/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
16 @@ -743,7 +743,7 @@ void Decoration::updateShadow()
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
17 outlineColor.hslSaturationF(),
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
18 qBound(0.1, outlineColor.lightnessF(), 1.0),
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
19 s->isAlphaChannelSupported() ? 0.9 : 1.0);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
20 - outlineColor.lightnessF() >= 0.5 ? outlineColor = outlineColor.darker(170) : outlineColor = outlineColor.lighter(170);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
21 + outlineColor.lightnessF() >= 0.5 ? outlineColor = outlineColor.darker(m_outlineIntensity) : outlineColor = outlineColor.lighter(m_outlineIntensity);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
22
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
23 // Animated case, no cached shadow object
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
24 if ((m_shadowAnimation->state() == QAbstractAnimation::Running) && (m_shadowOpacity != 0.0) && (m_shadowOpacity != 1.0)) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
25 @@ -821,36 +821,38 @@ QSharedPointer<KDecoration2::DecorationShadow> Decoration::createShadowObject(co
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
26 painter.drawRoundedRect(innerRect, m_scaledCornerRadius + 0.5, m_scaledCornerRadius + 0.5);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
27
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
28 // Draw window outline
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
29 - const qreal outlineWidth = 1.001;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
30 - const qreal penOffset = outlineWidth / 2;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
31 -
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
32 - QRectF outlineRect = innerRect + QMarginsF(penOffset, penOffset, penOffset, penOffset);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
33 - qreal cornerSize = m_scaledCornerRadius * 2;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
34 - QRectF cornerRect(outlineRect.x(), outlineRect.y(), cornerSize, cornerSize);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
35 - QPainterPath outlinePath;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
36 -
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
37 - outlinePath.arcMoveTo(cornerRect, 180);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
38 - outlinePath.arcTo(cornerRect, 180, -90);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
39 - cornerRect.moveTopRight(outlineRect.topRight());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
40 - outlinePath.arcTo(cornerRect, 90, -90);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
41 -
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
42 - // Check if border size is "no borders" or "no side-borders"
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
43 - if (borderSize(true) == 0) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
44 - outlinePath.lineTo(outlineRect.bottomRight());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
45 - outlinePath.lineTo(outlineRect.bottomLeft());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
46 - } else {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
47 - cornerRect.moveBottomRight(outlineRect.bottomRight());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
48 - outlinePath.arcTo(cornerRect, 0, -90);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
49 - cornerRect.moveBottomLeft(outlineRect.bottomLeft());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
50 - outlinePath.arcTo(cornerRect, 270, -90);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
51 - }
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
52 - outlinePath.closeSubpath();
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
53 + if (m_outlineIntensity > 0) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
54 + const qreal outlineWidth = 1.001;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
55 + const qreal penOffset = outlineWidth / 2;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
56 +
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
57 + QRectF outlineRect = innerRect + QMarginsF(penOffset, penOffset, penOffset, penOffset);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
58 + qreal cornerSize = m_scaledCornerRadius * 2;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
59 + QRectF cornerRect(outlineRect.x(), outlineRect.y(), cornerSize, cornerSize);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
60 + QPainterPath outlinePath;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
61 +
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
62 + outlinePath.arcMoveTo(cornerRect, 180);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
63 + outlinePath.arcTo(cornerRect, 180, -90);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
64 + cornerRect.moveTopRight(outlineRect.topRight());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
65 + outlinePath.arcTo(cornerRect, 90, -90);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
66 +
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
67 + // Check if border size is "no borders" or "no side-borders"
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
68 + if (borderSize(true) == 0) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
69 + outlinePath.lineTo(outlineRect.bottomRight());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
70 + outlinePath.lineTo(outlineRect.bottomLeft());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
71 + } else {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
72 + cornerRect.moveBottomRight(outlineRect.bottomRight());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
73 + outlinePath.arcTo(cornerRect, 0, -90);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
74 + cornerRect.moveBottomLeft(outlineRect.bottomLeft());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
75 + outlinePath.arcTo(cornerRect, 270, -90);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
76 + }
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
77 + outlinePath.closeSubpath();
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
78
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
79 - painter.setPen(QPen(outlineColor, outlineWidth));
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
80 - painter.setBrush(Qt::NoBrush);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
81 - painter.setCompositionMode(QPainter::CompositionMode_Source);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
82 - painter.setRenderHint(QPainter::Antialiasing);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
83 - painter.drawPath(outlinePath);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
84 + painter.setPen(QPen(outlineColor, outlineWidth));
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
85 + painter.setBrush(Qt::NoBrush);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
86 + painter.setCompositionMode(QPainter::CompositionMode_Source);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
87 + painter.setRenderHint(QPainter::Antialiasing);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
88 + painter.drawPath(outlinePath);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
89 + }
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
90
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
91 painter.end();
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
92
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
93 diff --git a/kdecoration/breezedecoration.h b/kdecoration/breezedecoration.h
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
94 index 826e396d8..0cb7864d9 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
95 --- a/kdecoration/breezedecoration.h
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
96 +++ b/kdecoration/breezedecoration.h
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
97 @@ -131,6 +131,8 @@ private:
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
98 qreal m_opacity = 0;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
99 qreal m_shadowOpacity = 0;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
100
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
101 + int m_outlineIntensity = 170;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
102 +
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
103 //*frame corner radius, scaled according to DPI
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
104 qreal m_scaledCornerRadius = 3;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
105
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
106 --
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
107 GitLab
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
108
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
109
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
110 From 31a801b59d7cb33a4c1d944ee0ab49637f5c7dc0 Mon Sep 17 00:00:00 2001
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
111 From: Akseli Lahtinen <akselmo@akselmo.dev>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
112 Date: Sun, 26 Feb 2023 20:08:52 +0200
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
113 Subject: [PATCH 2/7] add outline intensity setting
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
114
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
115 ---
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
116 kdecoration/breezedecoration.cpp | 5 ++--
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
117 kdecoration/breezedecoration.h | 2 --
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
118 kdecoration/breezesettingsdata.kcfg | 6 +++++
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
119 kdecoration/config/breezeconfigwidget.cpp | 6 +++++
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
120 .../config/ui/breezeconfigurationui.ui | 25 ++++++++++++++++++-
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
121 5 files changed, 39 insertions(+), 5 deletions(-)
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
122
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
123 diff --git a/kdecoration/breezedecoration.cpp b/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
124 index 699221b79..d6ae873e5 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
125 --- a/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
126 +++ b/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
127 @@ -743,7 +743,8 @@ void Decoration::updateShadow()
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
128 outlineColor.hslSaturationF(),
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
129 qBound(0.1, outlineColor.lightnessF(), 1.0),
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
130 s->isAlphaChannelSupported() ? 0.9 : 1.0);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
131 - outlineColor.lightnessF() >= 0.5 ? outlineColor = outlineColor.darker(m_outlineIntensity) : outlineColor = outlineColor.lighter(m_outlineIntensity);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
132 + outlineColor.lightnessF() >= 0.5 ? outlineColor = outlineColor.darker(m_internalSettings->outlineIntensity())
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
133 + : outlineColor = outlineColor.lighter(m_internalSettings->outlineIntensity());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
134
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
135 // Animated case, no cached shadow object
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
136 if ((m_shadowAnimation->state() == QAbstractAnimation::Running) && (m_shadowOpacity != 0.0) && (m_shadowOpacity != 1.0)) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
137 @@ -821,7 +822,7 @@ QSharedPointer<KDecoration2::DecorationShadow> Decoration::createShadowObject(co
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
138 painter.drawRoundedRect(innerRect, m_scaledCornerRadius + 0.5, m_scaledCornerRadius + 0.5);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
139
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
140 // Draw window outline
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
141 - if (m_outlineIntensity > 0) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
142 + if (m_internalSettings->outlineIntensity() > 0) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
143 const qreal outlineWidth = 1.001;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
144 const qreal penOffset = outlineWidth / 2;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
145
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
146 diff --git a/kdecoration/breezedecoration.h b/kdecoration/breezedecoration.h
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
147 index 0cb7864d9..826e396d8 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
148 --- a/kdecoration/breezedecoration.h
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
149 +++ b/kdecoration/breezedecoration.h
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
150 @@ -131,8 +131,6 @@ private:
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
151 qreal m_opacity = 0;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
152 qreal m_shadowOpacity = 0;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
153
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
154 - int m_outlineIntensity = 170;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
155 -
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
156 //*frame corner radius, scaled according to DPI
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
157 qreal m_scaledCornerRadius = 3;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
158
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
159 diff --git a/kdecoration/breezesettingsdata.kcfg b/kdecoration/breezesettingsdata.kcfg
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
160 index f57f61fe4..616035f9e 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
161 --- a/kdecoration/breezesettingsdata.kcfg
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
162 +++ b/kdecoration/breezesettingsdata.kcfg
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
163 @@ -35,6 +35,12 @@
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
164 <default>false</default>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
165 </entry>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
166
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
167 + <entry name="OutlineIntensity" type = "Int">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
168 + <default>170</default>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
169 + <min>0</min>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
170 + <max>200</max>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
171 + </entry>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
172 +
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
173 </group>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
174
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
175 <group name="Windeco">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
176 diff --git a/kdecoration/config/breezeconfigwidget.cpp b/kdecoration/config/breezeconfigwidget.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
177 index f75e1b3b7..e1e0dd63a 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
178 --- a/kdecoration/config/breezeconfigwidget.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
179 +++ b/kdecoration/config/breezeconfigwidget.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
180 @@ -38,6 +38,7 @@ ConfigWidget::ConfigWidget(QWidget *parent, const QVariantList &args)
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
181 connect(m_ui.shadowSize, SIGNAL(currentIndexChanged(int)), SLOT(updateChanged()));
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
182 connect(m_ui.shadowStrength, SIGNAL(valueChanged(int)), SLOT(updateChanged()));
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
183 connect(m_ui.shadowColor, &KColorButton::changed, this, &ConfigWidget::updateChanged);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
184 + connect(m_ui.outlineIntensity, SIGNAL(valueChanged(int)), SLOT(updateChanged()));
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
185
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
186 // track exception changes
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
187 connect(m_ui.exceptions, &ExceptionListWidget::changed, this, &ConfigWidget::updateChanged);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
188 @@ -69,6 +70,7 @@ void ConfigWidget::load()
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
189
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
190 m_ui.shadowStrength->setValue(qRound(qreal(m_internalSettings->shadowStrength() * 100) / 255));
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
191 m_ui.shadowColor->setColor(m_internalSettings->shadowColor());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
192 + m_ui.outlineIntensity->setValue(m_internalSettings->outlineIntensity());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
193
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
194 // load exceptions
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
195 ExceptionList exceptions;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
196 @@ -94,6 +96,7 @@ void ConfigWidget::save()
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
197 m_internalSettings->setShadowSize(m_ui.shadowSize->currentIndex());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
198 m_internalSettings->setShadowStrength(qRound(qreal(m_ui.shadowStrength->value() * 255) / 100));
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
199 m_internalSettings->setShadowColor(m_ui.shadowColor->color());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
200 + m_internalSettings->setOutlineIntensity(m_ui.outlineIntensity->value());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
201
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
202 // save configuration
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
203 m_internalSettings->save();
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
204 @@ -136,6 +139,7 @@ void ConfigWidget::defaults()
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
205 m_ui.shadowSize->setCurrentIndex(m_internalSettings->shadowSize());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
206 m_ui.shadowStrength->setValue(qRound(qreal(m_internalSettings->shadowStrength() * 100) / 255));
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
207 m_ui.shadowColor->setColor(m_internalSettings->shadowColor());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
208 + m_ui.outlineIntensity->setValue(m_internalSettings->outlineIntensity());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
209 }
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
210
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
211 //_______________________________________________
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
212 @@ -167,6 +171,8 @@ void ConfigWidget::updateChanged()
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
213 modified = true;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
214 } else if (m_ui.shadowColor->color() != m_internalSettings->shadowColor()) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
215 modified = true;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
216 + } else if (m_ui.outlineIntensity->value() != m_internalSettings->outlineIntensity()) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
217 + modified = true;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
218
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
219 // exceptions
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
220 } else if (m_ui.exceptions->isChanged()) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
221 diff --git a/kdecoration/config/ui/breezeconfigurationui.ui b/kdecoration/config/ui/breezeconfigurationui.ui
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
222 index f29e38c13..6d1f6a7b2 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
223 --- a/kdecoration/config/ui/breezeconfigurationui.ui
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
224 +++ b/kdecoration/config/ui/breezeconfigurationui.ui
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
225 @@ -290,7 +290,30 @@
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
226 <item row="2" column="1">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
227 <widget class="KColorButton" name="shadowColor"/>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
228 </item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
229 - <item row="3" column="0" colspan="3">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
230 + <item row="3" column="0">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
231 + <widget class="QLabel" name="label_6">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
232 + <property name="text">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
233 + <string comment="outline intensity">Outline intensity</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
234 + </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
235 + <property name="alignment">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
236 + <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
237 + </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
238 + <property name="buddy">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
239 + <cstring>outlineIntensity</cstring>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
240 + </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
241 + </widget>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
242 + </item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
243 + <item row="3" column="1">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
244 + <widget class="QSpinBox" name="outlineIntensity">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
245 + <property name="minimum">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
246 + <number>0</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
247 + </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
248 + <property name="maximum">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
249 + <number>200</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
250 + </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
251 + </widget>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
252 + </item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
253 + <item row="4" column="0" colspan="3">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
254 <spacer name="verticalSpacer_3">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
255 <property name="orientation">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
256 <enum>Qt::Vertical</enum>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
257 --
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
258 GitLab
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
259
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
260
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
261 From 70ab16974547b351f50ef977afe05a37c28b289a Mon Sep 17 00:00:00 2001
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
262 From: Akseli Lahtinen <akselmo@akselmo.dev>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
263 Date: Wed, 1 Mar 2023 20:52:55 +0200
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
264 Subject: [PATCH 3/7] Set outline intensity default to 100, add slider
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
265
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
266 ---
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
267 kdecoration/breezedecoration.cpp | 2 +-
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
268 kdecoration/breezesettingsdata.kcfg | 2 +-
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
269 .../config/ui/breezeconfigurationui.ui | 21 ++++++++++++++++---
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
270 3 files changed, 20 insertions(+), 5 deletions(-)
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
271
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
272 diff --git a/kdecoration/breezedecoration.cpp b/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
273 index d6ae873e5..3e2b145d5 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
274 --- a/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
275 +++ b/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
276 @@ -822,7 +822,7 @@ QSharedPointer<KDecoration2::DecorationShadow> Decoration::createShadowObject(co
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
277 painter.drawRoundedRect(innerRect, m_scaledCornerRadius + 0.5, m_scaledCornerRadius + 0.5);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
278
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
279 // Draw window outline
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
280 - if (m_internalSettings->outlineIntensity() > 0) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
281 + if (m_internalSettings->outlineIntensity() > 100) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
282 const qreal outlineWidth = 1.001;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
283 const qreal penOffset = outlineWidth / 2;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
284
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
285 diff --git a/kdecoration/breezesettingsdata.kcfg b/kdecoration/breezesettingsdata.kcfg
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
286 index 616035f9e..88db8e643 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
287 --- a/kdecoration/breezesettingsdata.kcfg
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
288 +++ b/kdecoration/breezesettingsdata.kcfg
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
289 @@ -37,7 +37,7 @@
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
290
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
291 <entry name="OutlineIntensity" type = "Int">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
292 <default>170</default>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
293 - <min>0</min>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
294 + <min>100</min>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
295 <max>200</max>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
296 </entry>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
297
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
298 diff --git a/kdecoration/config/ui/breezeconfigurationui.ui b/kdecoration/config/ui/breezeconfigurationui.ui
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
299 index 6d1f6a7b2..ef130a5cf 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
300 --- a/kdecoration/config/ui/breezeconfigurationui.ui
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
301 +++ b/kdecoration/config/ui/breezeconfigurationui.ui
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
302 @@ -293,7 +293,7 @@
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
303 <item row="3" column="0">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
304 <widget class="QLabel" name="label_6">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
305 <property name="text">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
306 - <string comment="outline intensity">Outline intensity</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
307 + <string comment="outline intensity">Outline intensity:</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
308 </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
309 <property name="alignment">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
310 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
311 @@ -304,13 +304,28 @@
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
312 </widget>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
313 </item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
314 <item row="3" column="1">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
315 - <widget class="QSpinBox" name="outlineIntensity">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
316 + <widget class="QSlider" name="outlineIntensity">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
317 <property name="minimum">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
318 - <number>0</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
319 + <number>100</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
320 </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
321 <property name="maximum">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
322 <number>200</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
323 </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
324 + <property name="singleStep">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
325 + <number>10</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
326 + </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
327 + <property name="pageStep">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
328 + <number>10</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
329 + </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
330 + <property name="orientation">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
331 + <enum>Qt::Horizontal</enum>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
332 + </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
333 + <property name="tickPosition">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
334 + <enum>QSlider::TicksBelow</enum>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
335 + </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
336 + <property name="tickInterval">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
337 + <number>10</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
338 + </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
339 </widget>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
340 </item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
341 <item row="4" column="0" colspan="3">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
342 --
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
343 GitLab
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
344
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
345
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
346 From 4bf3cd06c2cc938d161c872bba76427ff993fd2d Mon Sep 17 00:00:00 2001
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
347 From: Akseli Lahtinen <akselmo@akselmo.dev>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
348 Date: Thu, 2 Mar 2023 12:59:49 +0200
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
349 Subject: [PATCH 4/7] better intensity values
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
350
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
351 ---
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
352 kdecoration/breezedecoration.cpp | 2 +-
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
353 kdecoration/breezesettingsdata.kcfg | 4 ++--
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
354 kdecoration/config/ui/breezeconfigurationui.ui | 10 +++++-----
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
355 3 files changed, 8 insertions(+), 8 deletions(-)
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
356
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
357 diff --git a/kdecoration/breezedecoration.cpp b/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
358 index 3e2b145d5..abc805e70 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
359 --- a/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
360 +++ b/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
361 @@ -822,7 +822,7 @@ QSharedPointer<KDecoration2::DecorationShadow> Decoration::createShadowObject(co
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
362 painter.drawRoundedRect(innerRect, m_scaledCornerRadius + 0.5, m_scaledCornerRadius + 0.5);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
363
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
364 // Draw window outline
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
365 - if (m_internalSettings->outlineIntensity() > 100) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
366 + if (m_internalSettings->outlineIntensity() > 110) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
367 const qreal outlineWidth = 1.001;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
368 const qreal penOffset = outlineWidth / 2;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
369
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
370 diff --git a/kdecoration/breezesettingsdata.kcfg b/kdecoration/breezesettingsdata.kcfg
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
371 index 88db8e643..1d3db8bd2 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
372 --- a/kdecoration/breezesettingsdata.kcfg
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
373 +++ b/kdecoration/breezesettingsdata.kcfg
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
374 @@ -37,8 +37,8 @@
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
375
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
376 <entry name="OutlineIntensity" type = "Int">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
377 <default>170</default>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
378 - <min>100</min>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
379 - <max>200</max>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
380 + <min>110</min>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
381 + <max>250</max>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
382 </entry>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
383
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
384 </group>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
385 diff --git a/kdecoration/config/ui/breezeconfigurationui.ui b/kdecoration/config/ui/breezeconfigurationui.ui
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
386 index ef130a5cf..3385c97e9 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
387 --- a/kdecoration/config/ui/breezeconfigurationui.ui
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
388 +++ b/kdecoration/config/ui/breezeconfigurationui.ui
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
389 @@ -306,16 +306,16 @@
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
390 <item row="3" column="1">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
391 <widget class="QSlider" name="outlineIntensity">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
392 <property name="minimum">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
393 - <number>100</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
394 + <number>110</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
395 </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
396 <property name="maximum">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
397 - <number>200</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
398 + <number>250</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
399 </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
400 <property name="singleStep">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
401 - <number>10</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
402 + <number>20</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
403 </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
404 <property name="pageStep">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
405 - <number>10</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
406 + <number>20</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
407 </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
408 <property name="orientation">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
409 <enum>Qt::Horizontal</enum>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
410 @@ -324,7 +324,7 @@
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
411 <enum>QSlider::TicksBelow</enum>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
412 </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
413 <property name="tickInterval">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
414 - <number>10</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
415 + <number>20</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
416 </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
417 </widget>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
418 </item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
419 --
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
420 GitLab
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
421
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
422
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
423 From 0f31f23648463ce4c0aa9e90fb74deccff273bc3 Mon Sep 17 00:00:00 2001
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
424 From: Akseli Lahtinen <akselmo@akselmo.dev>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
425 Date: Thu, 2 Mar 2023 18:13:14 +0200
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
426 Subject: [PATCH 5/7] change from slider to combobox
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
427
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
428 ---
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
429 kdecoration/breezedecoration.cpp | 25 ++++++++--
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
430 kdecoration/breezesettingsdata.kcfg | 14 ++++--
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
431 kdecoration/config/breezeconfigwidget.cpp | 14 ++++--
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
432 .../config/ui/breezeconfigurationui.ui | 48 ++++++++++---------
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
433 4 files changed, 67 insertions(+), 34 deletions(-)
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
434
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
435 diff --git a/kdecoration/breezedecoration.cpp b/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
436 index abc805e70..eb4a7d0ec 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
437 --- a/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
438 +++ b/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
439 @@ -111,6 +111,25 @@ inline CompositeShadowParams lookupShadowParams(int size)
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
440 return s_shadowParams[3];
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
441 }
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
442 }
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
443 +
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
444 +inline int lookupOutlineIntensity(int intensity)
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
445 +{
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
446 + switch (intensity) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
447 + case Breeze::InternalSettings::OutlineOff:
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
448 + return 100;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
449 + case Breeze::InternalSettings::OutlineLow:
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
450 + return 130;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
451 + case Breeze::InternalSettings::OutlineMedium:
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
452 + return 170;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
453 + case Breeze::InternalSettings::OutlineHigh:
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
454 + return 210;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
455 + case Breeze::InternalSettings::OutlineMaximum:
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
456 + return 250;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
457 + default:
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
458 + // Fallback to the Medium intensity.
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
459 + return 170;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
460 + }
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
461 +}
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
462 }
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
463
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
464 namespace Breeze
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
465 @@ -743,8 +762,8 @@ void Decoration::updateShadow()
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
466 outlineColor.hslSaturationF(),
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
467 qBound(0.1, outlineColor.lightnessF(), 1.0),
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
468 s->isAlphaChannelSupported() ? 0.9 : 1.0);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
469 - outlineColor.lightnessF() >= 0.5 ? outlineColor = outlineColor.darker(m_internalSettings->outlineIntensity())
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
470 - : outlineColor = outlineColor.lighter(m_internalSettings->outlineIntensity());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
471 + outlineColor.lightnessF() >= 0.5 ? outlineColor = outlineColor.darker(lookupOutlineIntensity(m_internalSettings->outlineIntensity()))
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
472 + : outlineColor = outlineColor.lighter(lookupOutlineIntensity(m_internalSettings->outlineIntensity()));
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
473
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
474 // Animated case, no cached shadow object
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
475 if ((m_shadowAnimation->state() == QAbstractAnimation::Running) && (m_shadowOpacity != 0.0) && (m_shadowOpacity != 1.0)) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
476 @@ -822,7 +841,7 @@ QSharedPointer<KDecoration2::DecorationShadow> Decoration::createShadowObject(co
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
477 painter.drawRoundedRect(innerRect, m_scaledCornerRadius + 0.5, m_scaledCornerRadius + 0.5);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
478
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
479 // Draw window outline
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
480 - if (m_internalSettings->outlineIntensity() > 110) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
481 + if (lookupOutlineIntensity(m_internalSettings->outlineIntensity()) > 110) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
482 const qreal outlineWidth = 1.001;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
483 const qreal penOffset = outlineWidth / 2;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
484
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
485 diff --git a/kdecoration/breezesettingsdata.kcfg b/kdecoration/breezesettingsdata.kcfg
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
486 index 1d3db8bd2..559983d79 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
487 --- a/kdecoration/breezesettingsdata.kcfg
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
488 +++ b/kdecoration/breezesettingsdata.kcfg
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
489 @@ -35,12 +35,16 @@
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
490 <default>false</default>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
491 </entry>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
492
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
493 - <entry name="OutlineIntensity" type = "Int">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
494 - <default>170</default>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
495 - <min>110</min>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
496 - <max>250</max>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
497 + <entry name="OutlineIntensity" type = "Enum">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
498 + <choices>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
499 + <choice name="OutlineOff"/>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
500 + <choice name="OutlineLow"/>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
501 + <choice name="OutlineMedium"/>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
502 + <choice name="OutlineHigh"/>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
503 + <choice name="OutlineMaximum"/>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
504 + </choices>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
505 + <default>OutlineMedium</default>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
506 </entry>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
507 -
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
508 </group>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
509
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
510 <group name="Windeco">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
511 diff --git a/kdecoration/config/breezeconfigwidget.cpp b/kdecoration/config/breezeconfigwidget.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
512 index e1e0dd63a..d57c08463 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
513 --- a/kdecoration/config/breezeconfigwidget.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
514 +++ b/kdecoration/config/breezeconfigwidget.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
515 @@ -70,7 +70,13 @@ void ConfigWidget::load()
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
516
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
517 m_ui.shadowStrength->setValue(qRound(qreal(m_internalSettings->shadowStrength() * 100) / 255));
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
518 m_ui.shadowColor->setColor(m_internalSettings->shadowColor());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
519 - m_ui.outlineIntensity->setValue(m_internalSettings->outlineIntensity());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
520 +
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
521 + // load outline intensity
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
522 + if (m_internalSettings->outlineIntensity() <= InternalSettings::OutlineMaximum) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
523 + m_ui.outlineIntensity->setCurrentIndex(m_internalSettings->outlineIntensity());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
524 + } else {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
525 + m_ui.outlineIntensity->setCurrentIndex(InternalSettings::OutlineMedium);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
526 + }
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
527
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
528 // load exceptions
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
529 ExceptionList exceptions;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
530 @@ -96,7 +102,7 @@ void ConfigWidget::save()
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
531 m_internalSettings->setShadowSize(m_ui.shadowSize->currentIndex());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
532 m_internalSettings->setShadowStrength(qRound(qreal(m_ui.shadowStrength->value() * 255) / 100));
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
533 m_internalSettings->setShadowColor(m_ui.shadowColor->color());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
534 - m_internalSettings->setOutlineIntensity(m_ui.outlineIntensity->value());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
535 + m_internalSettings->setOutlineIntensity(m_ui.outlineIntensity->currentIndex());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
536
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
537 // save configuration
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
538 m_internalSettings->save();
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
539 @@ -139,7 +145,7 @@ void ConfigWidget::defaults()
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
540 m_ui.shadowSize->setCurrentIndex(m_internalSettings->shadowSize());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
541 m_ui.shadowStrength->setValue(qRound(qreal(m_internalSettings->shadowStrength() * 100) / 255));
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
542 m_ui.shadowColor->setColor(m_internalSettings->shadowColor());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
543 - m_ui.outlineIntensity->setValue(m_internalSettings->outlineIntensity());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
544 + m_ui.outlineIntensity->setCurrentIndex(m_internalSettings->outlineIntensity());
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
545 }
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
546
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
547 //_______________________________________________
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
548 @@ -171,7 +177,7 @@ void ConfigWidget::updateChanged()
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
549 modified = true;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
550 } else if (m_ui.shadowColor->color() != m_internalSettings->shadowColor()) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
551 modified = true;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
552 - } else if (m_ui.outlineIntensity->value() != m_internalSettings->outlineIntensity()) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
553 + } else if (m_ui.outlineIntensity->currentIndex() != m_internalSettings->outlineIntensity()) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
554 modified = true;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
555
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
556 // exceptions
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
557 diff --git a/kdecoration/config/ui/breezeconfigurationui.ui b/kdecoration/config/ui/breezeconfigurationui.ui
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
558 index 3385c97e9..e0283c93a 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
559 --- a/kdecoration/config/ui/breezeconfigurationui.ui
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
560 +++ b/kdecoration/config/ui/breezeconfigurationui.ui
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
561 @@ -304,28 +304,32 @@
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
562 </widget>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
563 </item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
564 <item row="3" column="1">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
565 - <widget class="QSlider" name="outlineIntensity">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
566 - <property name="minimum">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
567 - <number>110</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
568 - </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
569 - <property name="maximum">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
570 - <number>250</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
571 - </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
572 - <property name="singleStep">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
573 - <number>20</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
574 - </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
575 - <property name="pageStep">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
576 - <number>20</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
577 - </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
578 - <property name="orientation">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
579 - <enum>Qt::Horizontal</enum>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
580 - </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
581 - <property name="tickPosition">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
582 - <enum>QSlider::TicksBelow</enum>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
583 - </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
584 - <property name="tickInterval">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
585 - <number>20</number>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
586 - </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
587 + <widget class="QComboBox" name="outlineIntensity">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
588 + <item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
589 + <property name="text">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
590 + <string comment="@item:inlistbox Outline intensity:">Off</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
591 + </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
592 + </item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
593 + <item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
594 + <property name="text">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
595 + <string comment="@item:inlistbox Outline intensity:">Low</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
596 + </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
597 + </item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
598 + <item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
599 + <property name="text">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
600 + <string comment="@item:inlistbox Outline intensity:">Medium</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
601 + </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
602 + </item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
603 + <item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
604 + <property name="text">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
605 + <string comment="@item:inlistbox Outline intensity:">High</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
606 + </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
607 + </item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
608 + <item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
609 + <property name="text">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
610 + <string comment="@item:inlistbox Outline intensity:">Maximum</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
611 + </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
612 + </item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
613 </widget>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
614 </item>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
615 <item row="4" column="0" colspan="3">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
616 --
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
617 GitLab
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
618
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
619
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
620 From 2a41e807948af3cca43af814323f6d6e5295fb93 Mon Sep 17 00:00:00 2001
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
621 From: Akseli Lahtinen <akselmo@akselmo.dev>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
622 Date: Fri, 3 Mar 2023 00:49:14 +0200
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
623 Subject: [PATCH 6/7] rename shadow tab to shadows and outline
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
624
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
625 ---
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
626 kdecoration/config/ui/breezeconfigurationui.ui | 8 ++++----
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
627 1 file changed, 4 insertions(+), 4 deletions(-)
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
628
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
629 diff --git a/kdecoration/config/ui/breezeconfigurationui.ui b/kdecoration/config/ui/breezeconfigurationui.ui
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
630 index e0283c93a..a760f7b71 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
631 --- a/kdecoration/config/ui/breezeconfigurationui.ui
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
632 +++ b/kdecoration/config/ui/breezeconfigurationui.ui
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
633 @@ -193,13 +193,13 @@
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
634 </widget>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
635 <widget class="QWidget" name="tab_4">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
636 <attribute name="title">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
637 - <string>Shadows</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
638 + <string>Shadows and Outline</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
639 </attribute>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
640 <layout class="QGridLayout" name="gridLayout">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
641 <item row="0" column="0">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
642 <widget class="QLabel" name="label">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
643 <property name="text">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
644 - <string>Si&amp;ze:</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
645 + <string>Shadow size:</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
646 </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
647 <property name="alignment">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
648 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
649 @@ -241,7 +241,7 @@
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
650 <item row="1" column="0">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
651 <widget class="QLabel" name="label_2">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
652 <property name="text">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
653 - <string comment="strength of the shadow (from transparent to opaque)">S&amp;trength:</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
654 + <string comment="strength of the shadow (from transparent to opaque)">Shadow strength:</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
655 </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
656 <property name="alignment">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
657 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
658 @@ -280,7 +280,7 @@
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
659 <item row="2" column="0">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
660 <widget class="QLabel" name="label_5">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
661 <property name="text">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
662 - <string>Color:</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
663 + <string>Shadow color:</string>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
664 </property>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
665 <property name="alignment">
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
666 <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
667 --
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
668 GitLab
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
669
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
670
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
671 From d66927cb4994e91052f4e2441309e9354762d59c Mon Sep 17 00:00:00 2001
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
672 From: Nate Graham <nate@kde.org>
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
673 Date: Fri, 3 Mar 2023 20:17:54 +0000
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
674 Subject: [PATCH 7/7] change 110 to 100
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
675
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
676 ---
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
677 kdecoration/breezedecoration.cpp | 2 +-
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
678 1 file changed, 1 insertion(+), 1 deletion(-)
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
679
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
680 diff --git a/kdecoration/breezedecoration.cpp b/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
681 index eb4a7d0ec..410943f2a 100644
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
682 --- a/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
683 +++ b/kdecoration/breezedecoration.cpp
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
684 @@ -841,7 +841,7 @@ QSharedPointer<KDecoration2::DecorationShadow> Decoration::createShadowObject(co
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
685 painter.drawRoundedRect(innerRect, m_scaledCornerRadius + 0.5, m_scaledCornerRadius + 0.5);
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
686
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
687 // Draw window outline
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
688 - if (lookupOutlineIntensity(m_internalSettings->outlineIntensity()) > 110) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
689 + if (lookupOutlineIntensity(m_internalSettings->outlineIntensity()) > 100) {
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
690 const qreal outlineWidth = 1.001;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
691 const qreal penOffset = outlineWidth / 2;
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
692
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
693 --
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
694 GitLab
37508d4f31c8 [sync] imported 18f98a6..d0858fb from upstream
Migration Sync <gentoo-overlay@megacoffee.net>
parents:
diff changeset
695