diff --git a/colors/Breeze.colors b/colors/Breeze.colors --- a/colors/Breeze.colors +++ b/colors/Breeze.colors @@ -20,7 +20,7 @@ [Colors:Button] BackgroundAlternate=189,195,199 -BackgroundNormal=239,240,241 +BackgroundNormal=247,247,248 DecorationFocus=61,174,233 DecorationHover=147,206,233 ForegroundActive=61,174,233 @@ -37,12 +37,12 @@ BackgroundNormal=61,174,233 DecorationFocus=61,174,233 DecorationHover=147,206,233 -ForegroundActive=252,252,252 -ForegroundInactive=239,240,241 +ForegroundActive=255,255,255 +ForegroundInactive=247,247,248 ForegroundLink=253,188,75 ForegroundNegative=218,68,83 ForegroundNeutral=246,116,0 -ForegroundNormal=252,252,252 +ForegroundNormal=255,255,255 ForegroundPositive=39,174,96 ForegroundVisited=189,195,199 @@ -56,13 +56,13 @@ ForegroundLink=41,128,185 ForegroundNegative=218,68,83 ForegroundNeutral=246,116,0 -ForegroundNormal=252,252,252 +ForegroundNormal=255,255,255 ForegroundPositive=39,174,96 ForegroundVisited=127,140,141 [Colors:View] -BackgroundAlternate=239,240,241 -BackgroundNormal=252,252,252 +BackgroundAlternate=247,247,248 +BackgroundNormal=255,255,255 DecorationFocus=61,174,233 DecorationHover=147,206,233 ForegroundActive=61,174,233 @@ -76,7 +76,7 @@ [Colors:Window] BackgroundAlternate=189,195,199 -BackgroundNormal=239,240,241 +BackgroundNormal=247,247,248 DecorationFocus=61,174,233 DecorationHover=147,206,233 ForegroundActive=61,174,233 @@ -98,7 +98,7 @@ ForegroundLink=61,174,230 ForegroundNegative=231,76,60 ForegroundNeutral=253,188,75 -ForegroundNormal=239,240,241 +ForegroundNormal=247,247,248 ForegroundPositive=46,204,113 ForegroundVisited=61,174,230 @@ -156,9 +156,9 @@ contrast=4 [WM] -activeBackground=71,80,87 -activeBlend=252,252,252 -activeForeground=252,252,252 -inactiveBackground=239,240,241 +activeBackground=234,234,235 +activeBlend=255,255,255 +activeForeground=35,38,39 +inactiveBackground=247,247,248 inactiveBlend=75,71,67 inactiveForeground=189,195,199 diff --git a/colors/BreezeLight.colors b/colors/BreezeLight.colors deleted file mode 100644 --- a/colors/BreezeLight.colors +++ /dev/null @@ -1,152 +0,0 @@ -[ColorEffects:Disabled] -Color=56,56,56 -ColorAmount=0 -ColorEffect=0 -ContrastAmount=0.65 -ContrastEffect=1 -IntensityAmount=0.1 -IntensityEffect=2 - -[ColorEffects:Inactive] -ChangeSelectionColor=true -Color=112,111,110 -ColorAmount=0.025 -ColorEffect=2 -ContrastAmount=0.1 -ContrastEffect=2 -Enable=false -IntensityAmount=0 -IntensityEffect=0 - -[Colors:Button] -BackgroundAlternate=224,223,222 -BackgroundNormal=239,240,241 -DecorationFocus=61,174,233 -DecorationHover=142,203,233 -ForegroundActive=255,128,224 -ForegroundInactive=136,135,134 -ForegroundLink=0,87,174 -ForegroundNegative=191,3,3 -ForegroundNeutral=176,128,0 -ForegroundNormal=35,38,39 -ForegroundPositive=0,110,40 -ForegroundVisited=69,40,134 - -[Colors:Selection] -BackgroundAlternate=62,138,204 -BackgroundNormal=61,174,233 -DecorationFocus=61,174,233 -DecorationHover=142,203,233 -ForegroundActive=255,128,224 -ForegroundInactive=142,203,233 -ForegroundLink=0,49,110 -ForegroundNegative=156,14,14 -ForegroundNeutral=255,221,0 -ForegroundNormal=252,252,252 -ForegroundPositive=128,255,128 -ForegroundVisited=69,40,134 - -[Colors:Tooltip] -BackgroundAlternate=196,224,255 -BackgroundNormal=252,252,252 -DecorationFocus=61,174,233 -DecorationHover=142,203,233 -ForegroundActive=255,128,224 -ForegroundInactive=96,112,128 -ForegroundLink=0,87,174 -ForegroundNegative=191,3,3 -ForegroundNeutral=176,128,0 -ForegroundNormal=35,38,39 -ForegroundPositive=0,110,40 -ForegroundVisited=69,40,134 - -[Colors:View] -BackgroundAlternate=248,247,246 -BackgroundNormal=252,252,252 -DecorationFocus=61,174,233 -DecorationHover=142,203,233 -ForegroundActive=255,128,224 -ForegroundInactive=136,135,134 -ForegroundLink=0,87,174 -ForegroundNegative=191,3,3 -ForegroundNeutral=176,128,0 -ForegroundNormal=35,38,39 -ForegroundPositive=0,110,40 -ForegroundVisited=69,40,134 - -[Colors:Window] -BackgroundAlternate=218,217,216 -BackgroundNormal=239,240,241 -DecorationFocus=61,174,233 -DecorationHover=142,203,233 -ForegroundActive=255,128,224 -ForegroundInactive=136,135,134 -ForegroundLink=0,87,174 -ForegroundNegative=191,3,3 -ForegroundNeutral=176,128,0 -ForegroundNormal=35,38,39 -ForegroundPositive=0,110,40 -ForegroundVisited=69,40,134 - -[Colors:Complementary] -BackgroundAlternate=59,64,69 -BackgroundNormal=49,54,59 -DecorationFocus=30,146,255 -DecorationHover=61,174,230 -ForegroundActive=246,116,0 -ForegroundInactive=175,176,179 -ForegroundLink=61,174,230 -ForegroundNegative=237,21,21 -ForegroundNeutral=201,206,59 -ForegroundNormal=239,240,241 -ForegroundPositive=17,209,22 -ForegroundVisited=61,174,230 - -[General] -ColorScheme=Breeze Light -Name=Breeze Light -Name[ca]=Brisa clara -Name[ca@valencia]=Brisa clara -Name[cs]=Breeze Světlé -Name[da]=Breeze Light -Name[de]=Breeze Hell -Name[en_GB]=Breeze Light -Name[es]=Brisa claro -Name[et]=Breeze hele -Name[eu]=Breeze argia -Name[fi]=Breeze Light -Name[fr]=Brise clair -Name[gl]=Breeze claro -Name[hu]=Breeze Light -Name[ia]=Brisa Ligier -Name[id]=Breeze Terang -Name[it]=Brezza chiaro -Name[ko]=Breeze Light -Name[lt]=Breeze šviesus -Name[nl]=Breeze Light -Name[nn]=Breeze lys -Name[pa]=ਬਰੀਜ਼ ਹਲਕਾ -Name[pl]=Jasna Bryza -Name[pt]=Brisa Clara -Name[pt_BR]=Breeze Claro -Name[ru]=Breeze, светлый вариант -Name[sk]=Svetlý vánok -Name[sl]=Sapica lahka -Name[sv]=Breeze Light -Name[tg]=Насими сабук -Name[uk]=Світла Breeze -Name[x-test]=xxBreeze Lightxx -Name[zh_CN]=亮色微风 -Name[zh_TW]=Breeze Light -shadeSortColumn=true - -[KDE] -contrast=4 - -[WM] -activeBackground=239,240,241 -activeBlend=252,252,252 -activeForeground=35,38,39 -inactiveBackground=239,240,241 -inactiveBlend=75,71,67 -inactiveForeground=137,142,146 diff --git a/colors/CMakeLists.txt b/colors/CMakeLists.txt --- a/colors/CMakeLists.txt +++ b/colors/CMakeLists.txt @@ -4,5 +4,3 @@ DESTINATION ${DATA_INSTALL_DIR}/color-schemes/) install(FILES BreezeHighContrast.colors DESTINATION ${DATA_INSTALL_DIR}/color-schemes/) -install(FILES BreezeLight.colors - DESTINATION ${DATA_INSTALL_DIR}/color-schemes/) diff --git a/kdecoration/breezebutton.cpp b/kdecoration/breezebutton.cpp --- a/kdecoration/breezebutton.cpp +++ b/kdecoration/breezebutton.cpp @@ -419,9 +419,12 @@ } auto c = d->client().data(); + + QColor redColor( c->color( ColorGroup::Warning, ColorRole::Foreground ) ); + if( isPressed() ) { - if( type() == DecorationButtonType::Close ) return c->color( ColorGroup::Warning, ColorRole::Foreground ); + if( type() == DecorationButtonType::Close ) return redColor.darker(); else return KColorUtils::mix( d->titleBarColor(), d->fontColor(), 0.3 ); } else if( ( type() == DecorationButtonType::KeepBelow || type() == DecorationButtonType::KeepAbove || type() == DecorationButtonType::Shade ) && isChecked() ) { @@ -435,11 +438,11 @@ if( d->internalSettings()->outlineCloseButton() ) { - return KColorUtils::mix( d->fontColor(), c->color( ColorGroup::Warning, ColorRole::Foreground ).lighter(), m_opacity ); + return c->isActive() ? KColorUtils::mix( redColor, redColor.lighter(), m_opacity ) : KColorUtils::mix( redColor.lighter(), redColor, m_opacity ); } else { - QColor color( c->color( ColorGroup::Warning, ColorRole::Foreground ).lighter() ); + QColor color( redColor.lighter() ); color.setAlpha( color.alpha()*m_opacity ); return color; @@ -455,12 +458,12 @@ } else if( isHovered() ) { - if( type() == DecorationButtonType::Close ) return c->color( ColorGroup::Warning, ColorRole::Foreground ).lighter(); + if( type() == DecorationButtonType::Close ) return c->isActive() ? redColor.lighter() : redColor; else return d->fontColor(); } else if( type() == DecorationButtonType::Close && d->internalSettings()->outlineCloseButton() ) { - return d->fontColor(); + return c->isActive() ? redColor : redColor.lighter(); } else { diff --git a/kdecoration/breezesettingsdata.kcfg b/kdecoration/breezesettingsdata.kcfg --- a/kdecoration/breezesettingsdata.kcfg +++ b/kdecoration/breezesettingsdata.kcfg @@ -93,7 +93,7 @@ - true + false