forked from pool/breeze-gtk
Accepting request 934785 from KDE:Frameworks5
KDE Plasma 5.23.4 OBS-URL: https://build.opensuse.org/request/show/934785 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/breeze-gtk?expand=0&rev=108
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
fcbc5ee94e
@ -1,155 +0,0 @@
|
|||||||
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
|
|
||||||
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:76bf9712d45b6f821b9174de283e2d2c3ed202ce375cd306d7d41ea9e8080373
|
|
||||||
size 47608
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
-----BEGIN PGP SIGNATURE-----
|
|
||||||
|
|
||||||
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmGKaDUACgkQ11dEg7tX
|
|
||||||
sY13ZRAAhupSrpA86ajaLlxUi9XhnhC7tQM4cZDuZ+7o/q+HNCEPkh8ySs6hAuI3
|
|
||||||
3+1h3U9El6qRST0faz166NiEXqFzjz7GBUEuvZqFSVy7zDDtKmQnmK2Vi8zlHGvY
|
|
||||||
sRxJ/mdGsQpkPsgGH9JiaIpgvvOgg6DqBaBUQ1ReQucgUW+tFSuTvrsFc3unDDHi
|
|
||||||
3FGmHmcO5aiCeuvftWrM/+ZsZkWbgbwBp8pG0Zw1gw2iH9M+FJIFfno4jsf2t0rE
|
|
||||||
v7l/qoC01jMT+1xIdafSTPYwBDokcVp9aMDXS1LdkC/iI4daxVg9SHxZor/ReD3l
|
|
||||||
V5Tk511d+6PSniBbVqGQtb/TtEQNAr1JTXhSKJo26E32baOx1u7v/DazVUkZTOSs
|
|
||||||
JmcSTkEd02lUvCqkpTv+MF+dmNI/jAwyUXhQT6oruBVPt23lLzcTI+YTAt2dsvI2
|
|
||||||
U/wjfRIhlYzjL+MeIbmLNfRXsBsYRi4WTNe45d9fIpxRC/ZMtLCp9ciHsmS2X1v0
|
|
||||||
U4ct4mncQI/g0YDrOlk5GQJ+PngBFNMNBGnou18AHOaLiJ54vSvSMBpSA2NcBZGt
|
|
||||||
n3+G9NYMxfFaHV9Jd4qJxwK2fbl2KhDz27yBUsNl7Q7aBXZfc3veY0u0lvER6w9N
|
|
||||||
CNDIjPxK1XFGYxKu9UBqN810vi0ANwxsnCmNVvKsYIQqf8ZwN1U=
|
|
||||||
=PAsg
|
|
||||||
-----END PGP SIGNATURE-----
|
|
||||||
3
breeze-gtk-5.23.4.tar.xz
Normal file
3
breeze-gtk-5.23.4.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:f8a66f39a619854f00f8d631835f8a9f41d92dffa17bc1c1a46f537e3c31604b
|
||||||
|
size 43560
|
||||||
16
breeze-gtk-5.23.4.tar.xz.sig
Normal file
16
breeze-gtk-5.23.4.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
|||||||
|
-----BEGIN PGP SIGNATURE-----
|
||||||
|
|
||||||
|
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmGmHWEACgkQ11dEg7tX
|
||||||
|
sY0vaQ//UM/5wTeGgQGMuW0oSuiNDLZapsaG/aLTJMWyxUyvhYYOkah/uMPgyJ/E
|
||||||
|
GNhrc+9ISHmtqoRJHFQHHzk/+GKMFS+ik52n89Mqzrdp8YHdoebHXVCfQc0WS7KC
|
||||||
|
U4IubNe+jKq/xzveCFykrYuAJp2Liy2zxvcoTz61W/xx9Ca93h6JvgAU1waUTTja
|
||||||
|
EVyQmkInzKHInDnVVt7vTS4a6vLyyxxHxeMaTMg87aqEu8St4TCqEYltY/OPY4ru
|
||||||
|
Anm5Li13frkoofPI1tTvKAJVOMqa0GftChmqUN0+zV3YsVEbPq9b1deH6AI0rrt5
|
||||||
|
zv52wXDIkKSazdiaP1o9po9pQYGwlN8r//8oV3HH4rgZqiBlMeVSS7azOomcrvEy
|
||||||
|
LM/544xoWKSJy1bTHJubbuSaktfqaQv5hgwSV7g7QYWAL7/wrLW4ubaBwUqEzehV
|
||||||
|
+0hmDp2JZ0FMDXEqIRprHP00eww4IryIRAR2YhttL3OyhoICemVxcKwVsrOX6mP8
|
||||||
|
/NLwpeL4piqCAgCJRdHSNKxNeGoJ663NskAao45iPaH4hmsHkHUGVNNgUBqDS9dl
|
||||||
|
5nia5eXmt554PcXLpcKrrtsh/exdk8OUH4xAi9bCCnzZiUxxAXn8HKddV9IOuXhz
|
||||||
|
SCh6GG3QaWdssWzTcUnHD7uCsDfHt7jC9krNd+YS3OJVz0yr65I=
|
||||||
|
=wpfj
|
||||||
|
-----END PGP SIGNATURE-----
|
||||||
@ -1,3 +1,18 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Nov 30 14:59:18 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
- Update to 5.23.4
|
||||||
|
* New bugfix release
|
||||||
|
* For more details please see:
|
||||||
|
* https://kde.org/announcements/plasma/5/5.23.4
|
||||||
|
- Changes since 5.23.3:
|
||||||
|
* gtk3, gtk4: refactor buttons heavily, make look near-identical to breeze qstyle (kde#426557,kde#438185)
|
||||||
|
* gtk3, gtk4: format with prettier
|
||||||
|
* gtk3, gtk4: improve build times
|
||||||
|
* Fixed toolbar buttons style, removing unneeded outline (kde#443626)
|
||||||
|
- Drop patches, fixed upstream:
|
||||||
|
* 0001-Revert-gtk3-gtk4-update-button-style.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Nov 9 15:43:23 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
Tue Nov 9 15:43:23 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
|||||||
@ -19,19 +19,17 @@
|
|||||||
|
|
||||||
%define _name breeze
|
%define _name breeze
|
||||||
Name: breeze-gtk
|
Name: breeze-gtk
|
||||||
Version: 5.23.3
|
Version: 5.23.4
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: GTK+ theme matching KDE's Breeze
|
Summary: GTK+ theme matching KDE's Breeze
|
||||||
License: LGPL-2.1-only
|
License: LGPL-2.1-only
|
||||||
Group: System/GUI/KDE
|
Group: System/GUI/KDE
|
||||||
URL: https://projects.kde.org/breeze-gtk
|
URL: https://projects.kde.org/breeze-gtk
|
||||||
Source: breeze-gtk-%{version}.tar.xz
|
Source: https://download.kde.org/stable/plasma/%{version}/breeze-gtk-%{version}.tar.xz
|
||||||
%if %{with lang}
|
%if %{with lang}
|
||||||
Source1: breeze-gtk-%{version}.tar.xz.sig
|
Source1: https://download.kde.org/stable/plasma/%{version}/breeze-gtk-%{version}.tar.xz.sig
|
||||||
Source2: plasma.keyring
|
Source2: plasma.keyring
|
||||||
%endif
|
%endif
|
||||||
# PATCH-FIX-UPSTREAM
|
|
||||||
Patch0: 0001-Revert-gtk3-gtk4-update-button-style.patch
|
|
||||||
BuildRequires: breeze5-style
|
BuildRequires: breeze5-style
|
||||||
BuildRequires: cmake >= 3.16
|
BuildRequires: cmake >= 3.16
|
||||||
BuildRequires: extra-cmake-modules
|
BuildRequires: extra-cmake-modules
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user