From 950a78f2255ddc772718a6f0a1b6dd998daf7dfb Mon Sep 17 00:00:00 2001 From: Nate Graham Date: Mon, 3 May 2021 15:07:44 -0600 Subject: [PATCH] Revert "Revert 4d4db0b199780d8e3a94594fb72739565cd3919d's theme changes" This reverts commit 3701b184d85e715a2e56bb751f6b724c6e7d74db and allows the new higher Plasma transparancy to be shipped with Frameworks 5.83, right around the same time when Plasma 5.22 will be released. --- .../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, 69 insertions(+), 70 deletions(-) diff --git a/src/desktoptheme/breeze-dark/metadata.desktop.cmake b/src/desktoptheme/breeze-dark/metadata.desktop.cmake index da42f910b..f26ef6f59 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.2 -intensity=0.4 -saturation=1.7 +contrast=0.17 +intensity=1.25 +saturation=9 [AdaptiveTransparency] enabled=true diff --git a/src/desktoptheme/breeze-light/metadata.desktop.cmake b/src/desktoptheme/breeze-light/metadata.desktop.cmake index 272bda2ec..0c6326cf1 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.2 -intensity=2.0 -saturation=1.7 +contrast=0.17 +intensity=1.25 +saturation=9 [AdaptiveTransparency] enabled=true diff --git a/src/desktoptheme/breeze/metadata.desktop.cmake b/src/desktoptheme/breeze/metadata.desktop.cmake index 1e426f894..ad2e28c79 100644 --- a/src/desktoptheme/breeze/metadata.desktop.cmake +++ b/src/desktoptheme/breeze/metadata.desktop.cmake @@ -102,9 +102,8 @@ defaultHeight=1080 [ContrastEffect] enabled=true contrast=0.2 -#intensity is disabled, in order to auto adjust to the chosen theme color -#intensity=2.0 -saturation=1.7 +intensity=1.4 +saturation=10 [AdaptiveTransparency] enabled=true diff --git a/src/desktoptheme/breeze/translucent/dialogs/background.svg b/src/desktoptheme/breeze/translucent/dialogs/background.svg index e438ef104..705006f6e 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.6;fill:currentColor;fill-opacity:1;stroke:none" + style="opacity:0.85;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 0ea962612..2ae80ac19 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.6;fill:currentColor;fill-opacity:1;stroke:none" + style="opacity:0.85;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 4982e8783..fe4b6d39b 100644 --- a/src/desktoptheme/breeze/widgets/plasmoidheading.svg +++ b/src/desktoptheme/breeze/widgets/plasmoidheading.svg @@ -6,42 +6,42 @@ color:#eff0f1; } - - - + + + - + - + - + - + - - - - - + + + + + - + - + - + - + - - + +