From 3701b184d85e715a2e56bb751f6b724c6e7d74db Mon Sep 17 00:00:00 2001 From: Dominic Hayes Date: Tue, 9 Mar 2021 22:31:58 +0000 Subject: [PATCH] Revert 4d4db0b199780d8e3a94594fb72739565cd3919d's theme changes Undoes the theme changes in that commit since they got pushed too early in the Frameworks release cycle to be effectively Plasma 5.22 exclusive, saddling users on 5.21 with increased transparency all the time with no way to turn it off. This was not the intended user experience. This commit will be reverted in time to be released with Frameworks 5.83, which will align with the release of Plasma 5.22. BUG: 434202 --- .../breeze-dark/metadata.desktop.cmake | 6 +-- .../breeze-light/metadata.desktop.cmake | 6 +-- .../breeze/metadata.desktop.cmake | 5 +- .../breeze/translucent/dialogs/background.svg | 18 +++---- .../translucent/widgets/panel-background.svg | 50 +++++++++---------- .../breeze/translucent/widgets/tooltip.svg | 18 +++---- .../breeze/widgets/plasmoidheading.svg | 36 ++++++------- 7 files changed, 70 insertions(+), 69 deletions(-) diff --git a/src/desktoptheme/breeze-dark/metadata.desktop.cmake b/src/desktoptheme/breeze-dark/metadata.desktop.cmake index f26ef6f59..da42f910b 100644 --- a/src/desktoptheme/breeze-dark/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-dark/metadata.desktop.cmake @@ -102,9 +102,9 @@ defaultHeight=1080 [ContrastEffect] enabled=true -contrast=0.17 -intensity=1.25 -saturation=9 +contrast=0.2 +intensity=0.4 +saturation=1.7 [AdaptiveTransparency] enabled=true diff --git a/src/desktoptheme/breeze-light/metadata.desktop.cmake b/src/desktoptheme/breeze-light/metadata.desktop.cmake index 0c6326cf1..272bda2ec 100644 --- a/src/desktoptheme/breeze-light/metadata.desktop.cmake +++ b/src/desktoptheme/breeze-light/metadata.desktop.cmake @@ -100,9 +100,9 @@ defaultHeight=1080 [ContrastEffect] enabled=true -contrast=0.17 -intensity=1.25 -saturation=9 +contrast=0.2 +intensity=2.0 +saturation=1.7 [AdaptiveTransparency] enabled=true diff --git a/src/desktoptheme/breeze/metadata.desktop.cmake b/src/desktoptheme/breeze/metadata.desktop.cmake index ad2e28c79..1e426f894 100644 --- a/src/desktoptheme/breeze/metadata.desktop.cmake +++ b/src/desktoptheme/breeze/metadata.desktop.cmake @@ -102,8 +102,9 @@ defaultHeight=1080 [ContrastEffect] enabled=true contrast=0.2 -intensity=1.4 -saturation=10 +#intensity is disabled, in order to auto adjust to the chosen theme color +#intensity=2.0 +saturation=1.7 [AdaptiveTransparency] enabled=true diff --git a/src/desktoptheme/breeze/translucent/dialogs/background.svg b/src/desktoptheme/breeze/translucent/dialogs/background.svg index 705006f6e..e438ef104 100644 --- a/src/desktoptheme/breeze/translucent/dialogs/background.svg +++ b/src/desktoptheme/breeze/translucent/dialogs/background.svg @@ -943,14 +943,14 @@ height="32" width="6" id="rect4152" - style="opacity:0.85;fill:currentColor;fill-opacity:1;stroke:none" + style="opacity:0.6;fill:currentColor;fill-opacity:1;stroke:none" transform="matrix(0,-1,-1,0,0,0)" class="ColorScheme-Background" /> @@ -1005,7 +1005,7 @@ id="left"> - + - + - + - + - + - + - - - + + + - - - + + + - + - - - + + + - - - + + + - + - + @@ -214,16 +214,16 @@ - + - + - + - + diff --git a/src/desktoptheme/breeze/translucent/widgets/tooltip.svg b/src/desktoptheme/breeze/translucent/widgets/tooltip.svg index 2ae80ac19..0ea962612 100644 --- a/src/desktoptheme/breeze/translucent/widgets/tooltip.svg +++ b/src/desktoptheme/breeze/translucent/widgets/tooltip.svg @@ -947,7 +947,7 @@ height="32" width="6" id="rect4152" - style="opacity:0.85;fill:currentColor;fill-opacity:1;stroke:none" + style="opacity:0.6;fill:currentColor;fill-opacity:1;stroke:none" transform="matrix(0,-1,-1,0,0,0)" class="ColorScheme-Background" /> @@ -956,7 +956,7 @@ id="bottom"> diff --git a/src/desktoptheme/breeze/widgets/plasmoidheading.svg b/src/desktoptheme/breeze/widgets/plasmoidheading.svg index fe4b6d39b..4982e8783 100644 --- a/src/desktoptheme/breeze/widgets/plasmoidheading.svg +++ b/src/desktoptheme/breeze/widgets/plasmoidheading.svg @@ -6,42 +6,42 @@ color:#eff0f1; } - - - + + + - + - + - + - + - - - - - + + + + + - + - + - + - + - - + +