rpm/breeze-gtk
SHA256
1
0
Fork 0
forked from pool/breeze-gtk
Code Pull Requests Activity

Accepting request 924813 from KDE:Frameworks5

Browse Source 
- Add patch to fix toolbutton appearance (kde#443626):
  * 0001-Revert-gtk3-gtk4-update-button-style.patch

- 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

- 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

OBS-URL: https://build.opensuse.org/request/show/924813
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/breeze-gtk?expand=0&rev=104
This commit is contained in:
Dominique Leuenberger 2021-10-13 16:03:53 +00:00 committed by Git OBS Bridge
commit f9e991a2cd
8 changed files with 208 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

155
0001-Revert-gtk3-gtk4-update-button-style.patch Normal file
View File

@ -0,0 +1,155 @@
From fbce32bf0ff9232eaf8075b2fd6cc34002f1ef46 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
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

3
breeze-gtk-5.22.5.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c23bd1810cc491264b376f2e0187c48b4d979e2aaded7061792c35c54fd22e52
size 47424

11
breeze-gtk-5.22.5.tar.xz.sig
View File

@ -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-----

3
breeze-gtk-5.23.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:92eb49ba2e2144f8dfce970e4766e372d7e3448e46e22e742f3acb663df2a0d5
size 47608

16
breeze-gtk-5.23.0.tar.xz.sig Normal file
View File

@ -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-----

29
breeze-gtk.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Tue Oct 12 08:04:02 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
- 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 <fabian@ritter-vogt.de>
- 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 <fabian@ritter-vogt.de>
- 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 <fabian@ritter-vogt.de>

8
breeze-gtk.spec
View File

@ -19,17 +19,19 @@
%define _name breeze
Name: breeze-gtk
Version: 5.22.5
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/stable/plasma/%{version}/breeze-gtk-%{version}.tar.xz
Source: breeze-gtk-%{version}.tar.xz
%if %{with lang}
Source1: https://download.kde.org/stable/plasma/%{version}/breeze-gtk-%{version}.tar.xz.sig
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

BIN
plasma.keyring
View File

Binary file not shown.