From 733edf2cf0baa9eebdc4b4ae0e6d670d03771e1395cd281c3f240cc5012ed9ab Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 20 Sep 2021 06:13:40 +0000 Subject: [PATCH 1/4] Plasma 5.23 Beta. Tested on TW Live, seems to work. OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/breeze-gtk?expand=0&rev=143 --- breeze-gtk-5.22.5.tar.xz | 3 --- breeze-gtk-5.22.5.tar.xz.sig | 11 ----------- breeze-gtk-5.22.90.tar.xz | 3 +++ breeze-gtk-5.22.90.tar.xz.sig | 11 +++++++++++ breeze-gtk.changes | 11 +++++++++++ breeze-gtk.spec | 6 +++--- 6 files changed, 28 insertions(+), 17 deletions(-) delete mode 100644 breeze-gtk-5.22.5.tar.xz delete mode 100644 breeze-gtk-5.22.5.tar.xz.sig create mode 100644 breeze-gtk-5.22.90.tar.xz create mode 100644 breeze-gtk-5.22.90.tar.xz.sig diff --git a/breeze-gtk-5.22.5.tar.xz b/breeze-gtk-5.22.5.tar.xz deleted file mode 100644 index 5c4b010..0000000 --- a/breeze-gtk-5.22.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c23bd1810cc491264b376f2e0187c48b4d979e2aaded7061792c35c54fd22e52 -size 47424 diff --git a/breeze-gtk-5.22.5.tar.xz.sig b/breeze-gtk-5.22.5.tar.xz.sig deleted file mode 100644 index 7330100..0000000 --- a/breeze-gtk-5.22.5.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmEuEvIACgkQ7JTRj38F -mX6e6Af+LCC8qbwIXjre/hJt3yMjRRGsg1Qp2fKWoqPHfoNnJ4T7DOg8+Wld7esZ -UtVf6VJzQYCtzvtGK81JeP602E6IkKD89sWRshEgj34fBJwOl3vr3OZ0jACFahSp -Sctg3hhkozk8Y1tHoQq27HYeyjimjpOy73mhFYwzv+NCb+eOakVovmcvCh5CoDkf -ws/KG+2eYtmBV4GqTY8kcSWjtygitKsrwNLKe/sXrqXuleHS/JNxeE8IbAXtitfa -yGPVTIpARw7YCkstjhPghWCkB9squlsZbF26o9bvBrSy0BuaL+0/BgMFMnPwdYU0 -EsPj1GDslCs3O1OMj5ENj3FtxNl8vw== -=HFZh ------END PGP SIGNATURE----- diff --git a/breeze-gtk-5.22.90.tar.xz b/breeze-gtk-5.22.90.tar.xz new file mode 100644 index 0000000..9ff969c --- /dev/null +++ b/breeze-gtk-5.22.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e02d661b9e321f01a01070a1a804a432a3e3186ebd8131ce1133148df043e7a6 +size 47560 diff --git a/breeze-gtk-5.22.90.tar.xz.sig b/breeze-gtk-5.22.90.tar.xz.sig new file mode 100644 index 0000000..0ebebd1 --- /dev/null +++ b/breeze-gtk-5.22.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmFDATgACgkQ7JTRj38F +mX53aQf/XfN0XAp8ZMvzpu95nQ5qSJSRJfK7cIKxNHZit/GyplXnwiZNvQ0awn/s +OG6oTOLDJFKcxVjJuN9ipawg1MT+h9QJzkpYOhzs65ZfU1UY/MCIqyJOcqoHpsY4 +nbQ1M/cEuQRpPTpLDbB0M5jbIN70KZstT9ZRTFFCKR0zBVljGMrrTQricJWnW8A2 +hKUhBRx6PH/5KIEOl2+ykUHSK8OWUYVxiFh1AjHoNIZ6ZtRKH5nqoMxwaq/nhG4X +oE9v6wyrY/G4/XpzHXBdq4pcweQpMzOpCdBTY9LyZE9lNRzeIJX5mnloRW6fDXCA +6Hl68QeyI+Ouk+N0sVj3Ve0h3w+5YQ== +=744U +-----END PGP SIGNATURE----- diff --git a/breeze-gtk.changes b/breeze-gtk.changes index 602ee86..203e504 100644 --- a/breeze-gtk.changes +++ b/breeze-gtk.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Sep 16 13:04:45 UTC 2021 - Fabian Vogt + +- Update to 5.22.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.22.90 +- Changes since 5.22.5: + * ci: introduce .kde-ci.yml + * Use the python version found by cmake in build_theme.sh + ------------------------------------------------------------------- Tue Aug 31 19:08:38 UTC 2021 - Fabian Vogt diff --git a/breeze-gtk.spec b/breeze-gtk.spec index f251a4c..9e3a67b 100644 --- a/breeze-gtk.spec +++ b/breeze-gtk.spec @@ -19,15 +19,15 @@ %define _name breeze Name: breeze-gtk -Version: 5.22.5 +Version: 5.22.90 Release: 0 Summary: GTK+ theme matching KDE's Breeze License: LGPL-2.1-only Group: System/GUI/KDE URL: https://projects.kde.org/breeze-gtk -Source: https://download.kde.org/stable/plasma/%{version}/breeze-gtk-%{version}.tar.xz +Source: https://download.kde.org/unstable/plasma/%{version}/breeze-gtk-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/stable/plasma/%{version}/breeze-gtk-%{version}.tar.xz.sig +Source1: https://download.kde.org/unstable/plasma/%{version}/breeze-gtk-%{version}.tar.xz.sig Source2: plasma.keyring %endif BuildRequires: breeze5-style From a10d142aeccb463a4f072e3de0a198e5c49e323c73ac126057c25eea963a738e Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 11 Oct 2021 17:06:39 +0000 Subject: [PATCH 2/4] Plasma 5.23.0, lightly tested. KDE:Frameworks5 is already publish disabled. OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/breeze-gtk?expand=0&rev=144 --- breeze-gtk-5.22.90.tar.xz | 3 --- breeze-gtk-5.22.90.tar.xz.sig | 11 ----------- breeze-gtk-5.23.0.tar.xz | 3 +++ breeze-gtk-5.23.0.tar.xz.sig | 16 ++++++++++++++++ breeze-gtk.changes | 12 ++++++++++++ breeze-gtk.spec | 6 +++--- plasma.keyring | Bin 37825 -> 40445 bytes 7 files changed, 34 insertions(+), 17 deletions(-) delete mode 100644 breeze-gtk-5.22.90.tar.xz delete mode 100644 breeze-gtk-5.22.90.tar.xz.sig create mode 100644 breeze-gtk-5.23.0.tar.xz create mode 100644 breeze-gtk-5.23.0.tar.xz.sig diff --git a/breeze-gtk-5.22.90.tar.xz b/breeze-gtk-5.22.90.tar.xz deleted file mode 100644 index 9ff969c..0000000 --- a/breeze-gtk-5.22.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e02d661b9e321f01a01070a1a804a432a3e3186ebd8131ce1133148df043e7a6 -size 47560 diff --git a/breeze-gtk-5.22.90.tar.xz.sig b/breeze-gtk-5.22.90.tar.xz.sig deleted file mode 100644 index 0ebebd1..0000000 --- a/breeze-gtk-5.22.90.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAmFDATgACgkQ7JTRj38F -mX53aQf/XfN0XAp8ZMvzpu95nQ5qSJSRJfK7cIKxNHZit/GyplXnwiZNvQ0awn/s -OG6oTOLDJFKcxVjJuN9ipawg1MT+h9QJzkpYOhzs65ZfU1UY/MCIqyJOcqoHpsY4 -nbQ1M/cEuQRpPTpLDbB0M5jbIN70KZstT9ZRTFFCKR0zBVljGMrrTQricJWnW8A2 -hKUhBRx6PH/5KIEOl2+ykUHSK8OWUYVxiFh1AjHoNIZ6ZtRKH5nqoMxwaq/nhG4X -oE9v6wyrY/G4/XpzHXBdq4pcweQpMzOpCdBTY9LyZE9lNRzeIJX5mnloRW6fDXCA -6Hl68QeyI+Ouk+N0sVj3Ve0h3w+5YQ== -=744U ------END PGP SIGNATURE----- diff --git a/breeze-gtk-5.23.0.tar.xz b/breeze-gtk-5.23.0.tar.xz new file mode 100644 index 0000000..16b2b7f --- /dev/null +++ b/breeze-gtk-5.23.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:92eb49ba2e2144f8dfce970e4766e372d7e3448e46e22e742f3acb663df2a0d5 +size 47608 diff --git a/breeze-gtk-5.23.0.tar.xz.sig b/breeze-gtk-5.23.0.tar.xz.sig new file mode 100644 index 0000000..46567d7 --- /dev/null +++ b/breeze-gtk-5.23.0.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmFe2loACgkQ11dEg7tX +sY1y1hAAt4MHe/KgH7vO4x73fo+DhCsKjFWe/AY05yh7en2HN3zM9icdbLeiP6yR +X1BlItebiGp0cJPoAnvrIdjjsjCS1n1GKeM6+qjOfd3OC2oiYh+ln3e5VYlKglu7 +hNLaN4d0rggGn3hmvqA1jtxnWh9t2bXEPk7dAzx4JcSFC94NJ3ijXdpdEAR171vI +v3FtjtQ1PGlg4delYz2Oi7yB7OuhDTKBDK8cw89NBTOs8FfLfymMduQKCJoBBoSS +YtBsqxpVMrsEws1hXk5wlQ/+4po4UI9wEO88qi/R1GK0qLO9ctMC4YWOuiIMVT5r +Z0mWGI7r0QTi8WdFPQnr9LN0Dt1vAGrnGtjGWaxNZIbfc/L0H678NJNcwZY6gTTb +FhoDwmn/C4vwI6jqaZfCTK/0Rb5vvEOMUaDpvKPR9DNKq9NDZMVadXcLJbJ/DWTx +S8A6AN3ultolkD3CCTR3RRy4yhUY6zxYMe4wZmdTFPUUzhZpFQSd1u1nWJX/3OTp +51ErBj1VSJjrEfRw5EdDzKXo6R6DZjCLOjHcPsrKewqtYf2A2MuZQeCatZ4YKtxV +cBNyVtYFIm5r91BI6uHm3UNcNKQesU1gAT7BMLIUT40ur3C9JtPSSJ4X+UV9SAKz +a/3TNMlO5cQoWXCnKr6nvWUCuEeOhDToVliVkFBcpioJ+DtQu1g= +=KypB +-----END PGP SIGNATURE----- diff --git a/breeze-gtk.changes b/breeze-gtk.changes index 203e504..2619614 100644 --- a/breeze-gtk.changes +++ b/breeze-gtk.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Thu Oct 7 13:50:05 UTC 2021 - Fabian Vogt + +- Update to 5.23.0 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/plasma/5/5.23.0 +- Changes since 5.22.90: + * gtk3, gtk4: update button style + * Use Breeze Light as the default color scheme +- Add new key + signature to plasma.keyring + ------------------------------------------------------------------- Thu Sep 16 13:04:45 UTC 2021 - Fabian Vogt diff --git a/breeze-gtk.spec b/breeze-gtk.spec index 9e3a67b..f968378 100644 --- a/breeze-gtk.spec +++ b/breeze-gtk.spec @@ -19,15 +19,15 @@ %define _name breeze Name: breeze-gtk -Version: 5.22.90 +Version: 5.23.0 Release: 0 Summary: GTK+ theme matching KDE's Breeze License: LGPL-2.1-only Group: System/GUI/KDE URL: https://projects.kde.org/breeze-gtk -Source: https://download.kde.org/unstable/plasma/%{version}/breeze-gtk-%{version}.tar.xz +Source: breeze-gtk-%{version}.tar.xz %if %{with lang} -Source1: https://download.kde.org/unstable/plasma/%{version}/breeze-gtk-%{version}.tar.xz.sig +Source1: breeze-gtk-%{version}.tar.xz.sig Source2: plasma.keyring %endif BuildRequires: breeze5-style diff --git a/plasma.keyring b/plasma.keyring index 9bbbc6d3d53fb535534afdf38ca1d64dcfb3902af64703d9b1d57d240ec743d0..df40fb776807b94ca6709da686f04a0fc84670dfea9ea95f5b41c9426c9c9338 100644 GIT binary patch delta 2589 zcmZwHcQ_k}8^G}-Vvj`4RuRrV#Hz+Pv_-8$jm93mP&2VPZ4;w7)M}!&idNN*AoiA0 zqpiKJR%4w_tk&wUz31t3|NP!R-#_2y`+ho$KPp@3Fm>_AGa zNmAb1$05{vSw|P}ZF?NodcoIh7M;s$cJuppV>Q>NiDg*oD5jvo$wo~=6H&#LB-sbDUp$TXAbq|TFPserdUPT>_lNJ^Ps{9@_WiSAkX}2V(_+TW zrQg?LS>s5A)1@fr9Ux9zi{Y2RZY2da_~E;cCb)fv3^8|K8zs%UpyB>N(**)YF1Ga3 zzDr<$n>ravkyGs`5tLWf^G&wkWf|d(5Y2+ zz=b^*m`4jBn$R8Wv3A}{!jPQV<^f0z#gjU{ZLr>Kd83q#j#G+bo3de3fVf;F9@Xvx z`ZQm8x||wx^Y;wTXDeuXnn9C{ci?EdyA;;}#I2hwG$u{9+P{t8q&z=^m|pZjF$Oh^jS!69@p3*Z_e0e)oZZ ze}^n#gh9IodAOosdV$_@co7dtiFlAHmN@gPimGyjTt$v4VYOIu)Pa=H>Tp=^XW%(d2U$Q1m*DJ{7oSa_Yay zwHK{5?c2&NFE+<;o33jYTM1htvF*C=cri(CHjTD18z=sQJU11!tp2A=eQg^CgHW?AqE2-a>CK!@09!H6v%dxk;3ThOe@lr!n`L zpR_3TayNQFkIKk*g429#R|E8XQp#^!S?rB!)W^F$(o=t>N42an8xEDRe!pE-&8Z}Z zBAdw4BEqNf0hg%wG>f@cwT6ZUI7y5f^zRuaGYeh0nMA2!xRjgE;Her?>4?6?(KBj> zdPrGEgAA!l%=>xrW$eFnDVoekC{@@E*i5LV(jeCLc;S54^&sib>?}@x+rHfb=;tAC zJD17+OzX^92jI`%8|{eRsmO2?;2Sqol70+!(Gk%Qm|$;U`!S2#E^!w3B&kLWGpm;N zWbB(&eM#PZ5(9wldt88cpfVWxJt4vG3CRiC)BklXG;S`JD!xe=PQlSVp5rZKlN*f#-O^9oqua7S;mLfGH)4$lxw)*{{!~XS z)GKBmB@B(Xc=eY)f4ZHVQN0v1x1@8H(7@xjYw&cqK*IX!T#eP00KvbmJs5n}JE2vd z9KMu8_<6s^|KKJ}j)l`W@VSj^=CY&?v2j!;|5UoCkrjh$*eotWzE)-y{-h&f`<+9Y zOdgjJUR3jThQfng$DBe*O2$iAXlF(!m%PR63FBH`-QR}MyJPg1dd><&qqpNO?<5U! zRi2!I0v^1dAzjw~s%_pg4p@P5gE85TC*~{o+=?4*eH1`H$5-9vspWKMm5Bg`KKZEi zp@2LVlFCD+qFkIHqb5pgwLb+LL-d;Pi(YIRi2_g0dC8Nj0H@y>d0ofW|TDMdIB0w#Xggg>TD6ogI8mJ=c^4t9R;hLubtnCp>G$1^}yY}yi})12VZaF z6xw6Ok@rhB3{4eaI3^&rEcMtS8Fo;EnKOxE$W`GbBIA*4h@LmsuQay~YE8vH{lH&s zxTJo>=lHnjR3E+fIb&kB)}MEa4#?EN43i!7)4E_+UU1n!sb}`ikdb_RCT6zo4KGzs zxLW^(J07G8=Kuavu>V-b{U4V>0&GA2>Zio=zF&@&a)oCFeR{H;!epm z&`o98B>Q~a-$K27B#{^9sx5N~4S3@V4wsf?w`Ows68GQ(1+WLew3M{;^la21m-Z$H zXz@w2cF5zQ)_^y}JdGE)`9?y%rXcL2LNR-nlL115XKbeU{bG|(`78p1;C{zwqws;A z_-7u-_)=vkmU&Z5!`I0FiN=Ea)9aD-cjv2u#|mMx&T-`5>@~(}Ob5L~(n@$XE+t2X zym5>g$qXb2sq`>hFryjZC^A2IFMbOH_Qt|B$ zss){%!{49w9Y6)pE|GHhGrexGQ(@zIW@ zF4NEMz*7j~st#2 z;56~5DU%o)Wkk7$FJQ7ws!AmA{|b1IW{<`kzZlGq?Uz|lI&Wq)OO;t_Xhq)axMkP5 hU_UfOtq@RaIzU}Dv^5z>xzMH9#K5&oU&{ZK<$vmx;qw3h delta 9 Rcmeyno9W Date: Tue, 12 Oct 2021 08:07:49 +0000 Subject: [PATCH 3/4] Accepting request 924807 from home:Vogtinator:plasma5.23 - Add patch to fix toolbutton appearance (kde#443626): * 0001-Revert-gtk3-gtk4-update-button-style.patch OBS-URL: https://build.opensuse.org/request/show/924807 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/breeze-gtk?expand=0&rev=145 --- ...Revert-gtk3-gtk4-update-button-style.patch | 155 ++++++++++++++++++ breeze-gtk.changes | 6 + 2 files changed, 161 insertions(+) create mode 100644 0001-Revert-gtk3-gtk4-update-button-style.patch diff --git a/0001-Revert-gtk3-gtk4-update-button-style.patch b/0001-Revert-gtk3-gtk4-update-button-style.patch new file mode 100644 index 0000000..3b32a05 --- /dev/null +++ b/0001-Revert-gtk3-gtk4-update-button-style.patch @@ -0,0 +1,155 @@ +From fbce32bf0ff9232eaf8075b2fd6cc34002f1ef46 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Tue, 12 Oct 2021 10:03:30 +0200 +Subject: [PATCH] Revert "gtk3, gtk4: update button style" + +This reverts commit 3b2ce1abd2f45cf844c43cac6e7009a59bff0dd9. +--- + src/gtk3/widgets/_button.scss | 21 ++++++++++----------- + src/gtk3/widgets/_headerbar.scss | 6 ++++-- + src/gtk4/widgets/_button.scss | 28 ++++++++++------------------ + src/gtk4/widgets/_headerbar.scss | 3 +-- + 4 files changed, 25 insertions(+), 33 deletions(-) + +diff --git a/src/gtk3/widgets/_button.scss b/src/gtk3/widgets/_button.scss +index 4bd0ce7..004c4e6 100644 +--- a/src/gtk3/widgets/_button.scss ++++ b/src/gtk3/widgets/_button.scss +@@ -40,22 +40,16 @@ + // + // pushed button + // +- color: gtk("@theme_button_foreground_normal"); +- border-color: gtkmix(gtk("@theme_button_background_normal"), gtk("@theme_button_foreground_normal"), 0.3); +- background-color: gtkalpha(gtk("@theme_button_foreground_normal"), 0.125); +- } @else if $t == titlebar-active { +- // +- // pushed button +- // +- color: gtk("@theme_button_foreground_normal"); +- border-color: gtkmix(gtk("@theme_button_decoration_focus"), gtk("@theme_button_decoration_focus"), 0.3); +- background-color: gtkalpha(gtk("@theme_button_decoration_focus"), 0.125); ++ color: gtk("@theme_button_foreground_active"); ++ border-color: gtk("@theme_button_decoration_focus"); ++ background-color: gtk("@theme_button_decoration_focus"); + } @else if $t==active-hover { + // +- // pushed & hovered button ++ // + // + color: gtk("@theme_button_foreground_normal"); + border-color: gtk("@theme_button_decoration_hover"); ++ background-color: gtk("@theme_button_decoration_hover"); + } @else if $t==insensitive { + // + // insensitive button +@@ -176,6 +170,7 @@ $_dot_color: gtk("@theme_button_decoration_focus"); + + @include button(normal); + &.flat { ++ @include button(undecorated); + // to avoid adiacent buttons borders clashing when transitioning, the transition on the normal state is set + // to none, while it's added back in the hover state, so the button decoration will fade in on hover, but + // it won't fade out when the pointer leave the button allocation area. To make the transition more evident +@@ -228,12 +223,15 @@ $_dot_color: gtk("@theme_button_decoration_focus"); + } + &.flat:backdrop { + -gtk-icon-effect: none; ++ @include button(undecorated); + color: gtk("@theme_button_foreground_backdrop"); + } + &.flat:disabled { ++ @include button(undecorated); + color: gtk("@theme_button_foreground_insensitive"); + } + &.flat:backdrop:disabled { ++ @include button(undecorated); + color: gtk("@theme_button_foreground_backdrop_insensitive"); + } + &:disabled { +@@ -357,6 +355,7 @@ button { + &.flat:backdrop, + &.flat:disabled, + &.flat:backdrop:disabled { ++ @include button(undecorated); + color: gtkalpha($button_color, 0.8); + } + &:disabled { +diff --git a/src/gtk3/widgets/_headerbar.scss b/src/gtk3/widgets/_headerbar.scss +index 7db8451..1bfe580 100644 +--- a/src/gtk3/widgets/_headerbar.scss ++++ b/src/gtk3/widgets/_headerbar.scss +@@ -53,8 +53,10 @@ headerbar { + } + &:active, + &:checked { +- @include button(titlebar-active); +- color: gtk("@theme_titlebar_foreground"); ++ @include button(active); ++ &:hover { ++ @include button(active-hover); ++ } + &:backdrop { + background-image: none; + background-color: gtk("@theme_titlebar_background_backdrop"); +diff --git a/src/gtk4/widgets/_button.scss b/src/gtk4/widgets/_button.scss +index 08d84d7..c026430 100644 +--- a/src/gtk4/widgets/_button.scss ++++ b/src/gtk4/widgets/_button.scss +@@ -42,29 +42,21 @@ + } + + @else if $t==active { +- // +- // pushed button +- // +- color: gtk("@theme_button_foreground_normal"); +- border-color: gtkmix(gtk("@theme_button_background_normal"), gtk("@theme_button_foreground_normal"), 0.3); +- background-color: gtkalpha(gtk("@theme_button_foreground_normal"), 0.125); +- } +- +- @else if $t == titlebar-active { +- // +- // pushed button +- // +- color: gtk("@theme_button_foreground_normal"); +- border-color: gtkmix(gtk("@theme_button_decoration_focus"), gtk("@theme_button_decoration_focus"), 0.3); +- background-color: gtkalpha(gtk("@theme_button_decoration_focus"), 0.125); ++ // ++ // pushed button ++ // ++ color: gtk("@theme_button_foreground_active"); ++ border-color: gtk("@theme_button_decoration_focus"); ++ background-color: gtk("@theme_button_decoration_focus"); + } + + @else if $t==active-hover { +- // +- // pushed & hovered button +- // ++ // ++ // ++ // + color: gtk("@theme_button_foreground_normal"); + border-color: gtk("@theme_button_decoration_hover"); ++ background-color: gtk("@theme_button_decoration_hover"); + } + + @else if $t==insensitive { +diff --git a/src/gtk4/widgets/_headerbar.scss b/src/gtk4/widgets/_headerbar.scss +index b1a88c5..b09bc01 100644 +--- a/src/gtk4/widgets/_headerbar.scss ++++ b/src/gtk4/widgets/_headerbar.scss +@@ -50,8 +50,7 @@ headerbar { + } + } + &:active, &:checked { +- @include button(titlebar-active); +- color: gtk("@theme_titlebar_foreground"); ++ @include button(active); + &:hover { + @include button(active-hover); + } +-- +2.33.0 + diff --git a/breeze-gtk.changes b/breeze-gtk.changes index 2619614..404abcd 100644 --- a/breeze-gtk.changes +++ b/breeze-gtk.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 12 08:04:02 UTC 2021 - Fabian Vogt + +- Add patch to fix toolbutton appearance (kde#443626): + * 0001-Revert-gtk3-gtk4-update-button-style.patch + ------------------------------------------------------------------- Thu Oct 7 13:50:05 UTC 2021 - Fabian Vogt From a84048eddcc7648c16a926a4e34494e0b0c649fd7826c0b41ed8b70c891e67ea Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Tue, 12 Oct 2021 08:42:06 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/breeze-gtk?expand=0&rev=146 --- breeze-gtk.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/breeze-gtk.spec b/breeze-gtk.spec index f968378..5cda651 100644 --- a/breeze-gtk.spec +++ b/breeze-gtk.spec @@ -30,6 +30,8 @@ Source: breeze-gtk-%{version}.tar.xz Source1: breeze-gtk-%{version}.tar.xz.sig Source2: plasma.keyring %endif +# PATCH-FIX-UPSTREAM +Patch0: 0001-Revert-gtk3-gtk4-update-button-style.patch BuildRequires: breeze5-style BuildRequires: cmake >= 3.16 BuildRequires: extra-cmake-modules