Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package breeze-gtk for openSUSE:Factory checked in at 2021-10-13 18:03:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/breeze-gtk (Old) and /work/SRC/openSUSE:Factory/.breeze-gtk.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "breeze-gtk" Wed Oct 13 18:03:53 2021 rev:104 rq:924813 version:5.23.0 Changes: -------- --- /work/SRC/openSUSE:Factory/breeze-gtk/breeze-gtk.changes 2021-09-04 22:32:51.323952719 +0200 +++ /work/SRC/openSUSE:Factory/.breeze-gtk.new.2443/breeze-gtk.changes 2021-10-13 18:06:21.343299906 +0200 @@ -1,0 +2,29 @@ +Tue Oct 12 08:04:02 UTC 2021 - Fabian Vogt <fab...@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 <fab...@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 <fab...@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 + +------------------------------------------------------------------- Old: ---- breeze-gtk-5.22.5.tar.xz breeze-gtk-5.22.5.tar.xz.sig New: ---- 0001-Revert-gtk3-gtk4-update-button-style.patch breeze-gtk-5.23.0.tar.xz breeze-gtk-5.23.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ breeze-gtk.spec ++++++ --- /var/tmp/diff_new_pack.ErChhK/_old 2021-10-13 18:06:24.851305404 +0200 +++ /var/tmp/diff_new_pack.ErChhK/_new 2021-10-13 18:06:24.855305411 +0200 @@ -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 ++++++ 0001-Revert-gtk3-gtk4-update-button-style.patch ++++++ >From fbce32bf0ff9232eaf8075b2fd6cc34002f1ef46 Mon Sep 17 00:00:00 2001 From: Fabian Vogt <fab...@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 ++++++ breeze-gtk-5.22.5.tar.xz -> breeze-gtk-5.23.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/breeze-gtk-5.22.5/.kde-ci.yml new/breeze-gtk-5.23.0/.kde-ci.yml --- old/breeze-gtk-5.22.5/.kde-ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/breeze-gtk-5.23.0/.kde-ci.yml 2021-10-07 13:30:17.000000000 +0200 @@ -0,0 +1,5 @@ +Dependencies: +- 'on': ['Linux', 'FreeBSD'] + 'require': + 'frameworks/extra-cmake-modules': '@stable' + 'plasma/breeze': '@same' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/breeze-gtk-5.22.5/CMakeLists.txt new/breeze-gtk-5.23.0/CMakeLists.txt --- old/breeze-gtk-5.22.5/CMakeLists.txt 2021-08-31 13:30:38.000000000 +0200 +++ new/breeze-gtk-5.23.0/CMakeLists.txt 2021-10-07 13:30:17.000000000 +0200 @@ -1,5 +1,5 @@ project(breeze-gtk) -set(PROJECT_VERSION "5.22.5") +set(PROJECT_VERSION "5.23.0") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 3.16) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/breeze-gtk-5.22.5/src/CMakeLists.txt new/breeze-gtk-5.23.0/src/CMakeLists.txt --- old/breeze-gtk-5.22.5/src/CMakeLists.txt 2021-08-31 13:30:38.000000000 +0200 +++ new/breeze-gtk-5.23.0/src/CMakeLists.txt 2021-10-07 13:30:17.000000000 +0200 @@ -2,12 +2,13 @@ file(GLOB CSS_SOURCES "*.css") file(GLOB_RECURSE GTK2_SOURCES "gtk2/*") +configure_file(build_theme.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/build_theme.sh @ONLY) + set(SOURCES ${SCSS_SOURCES} ${CSS_SOURCES} ${GTK2_SOURCES} render_assets.py - build_theme.sh ) function(gen_targets THEME_NAME) @@ -28,16 +29,16 @@ add_custom_command( OUTPUT ${Breeze-Dark_TARGETS} - DEPENDS ${SOURCES} - COMMAND ./build_theme.sh -c BreezeDark -t "${PROJECT_BINARY_DIR}/Breeze-Dark" -r "${BREEZE_COLOR_INSTALL_ROOT}" + DEPENDS ${SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/build_theme.sh + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build_theme.sh -c BreezeDark -t "${PROJECT_BINARY_DIR}/Breeze-Dark" -r "${BREEZE_COLOR_INSTALL_ROOT}" WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/src" ) add_custom_target(Breeze-Dark ALL DEPENDS ${Breeze-Dark_TARGETS}) add_custom_command( OUTPUT ${Breeze_TARGETS} - DEPENDS ${SOURCES} - COMMAND ./build_theme.sh -c Breeze -t "${PROJECT_BINARY_DIR}/Breeze" -r "${BREEZE_COLOR_INSTALL_ROOT}" + DEPENDS ${SOURCES} ${CMAKE_CURRENT_BINARY_DIR}/build_theme.sh + COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build_theme.sh -c Breeze -t "${PROJECT_BINARY_DIR}/Breeze" -r "${BREEZE_COLOR_INSTALL_ROOT}" COMMAND cp gtk-dark-3.0.css "${PROJECT_BINARY_DIR}/Breeze/gtk-3.0/gtk-dark.css" WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}/src" ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/breeze-gtk-5.22.5/src/build_theme.sh new/breeze-gtk-5.23.0/src/build_theme.sh --- old/breeze-gtk-5.22.5/src/build_theme.sh 2021-08-31 13:30:38.000000000 +0200 +++ new/breeze-gtk-5.23.0/src/build_theme.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,113 +0,0 @@ -#!/bin/sh -set -e - -# Usage: create_folders <target-directory> -create_folders () { - for j in gtk-2.0 gtk-3.0 gtk-4.0; do - if ! [ -d "$1/$j" ]; then - mkdir -p "$1/$j" - fi - done -} - -# Usage: build_sass <source-directory> <target-directory> <include-directory> -build_sass() { - if command -v sassc >/dev/null 2>&1; then - sassc -I "$3" "$1" "$2" - else - sass -I "$3" --cache-location /tmp/sass-cache "$1" "$2" - fi -} - -# Usage: install_theme <theme-directory> <theme-name> <install-target-dir> -# If <install-target-dir> is unset or empty, install to $HOME/.local/share/themes/$THEME_NAME -install_theme () { - THEME_INSTALL_TARGET="$3" - if [ -z "${THEME_INSTALL_TARGET}" ]; then - THEME_INSTALL_TARGET="${HOME}/.local/share/themes/$2" - fi - echo "Installing into ${THEME_INSTALL_TARGET}" - mkdir -p "${THEME_INSTALL_TARGET}" - for dir in assets gtk-2.0 gtk-3.0 gtk-4.0; do - if [ -d "${THEME_INSTALL_TARGET}/$dir" ]; then - rm -rf "${THEME_INSTALL_TARGET:?}/$dir" - fi - mv -f "$1/$dir" "${THEME_INSTALL_TARGET}" - done - rmdir "$1" -} - -# Usage render_theme <colorscheme> <theme-name> <theme-install-target> <colorschemebase> -render_theme () { - THEME_BUILD_DIR="$(mktemp -d)" - create_folders "${THEME_BUILD_DIR}" - cp -R gtk2/* "${THEME_BUILD_DIR}/gtk-2.0/" - python3 render_assets.py -c "$1" -a "${THEME_BUILD_DIR}/assets" \ - -g "${THEME_BUILD_DIR}/gtk-2.0" -G "${THEME_BUILD_DIR}" -b "$4" - build_sass gtk3/gtk.scss "${THEME_BUILD_DIR}/gtk-3.0/gtk.css" "${THEME_BUILD_DIR}" - build_sass gtk4/gtk.scss "${THEME_BUILD_DIR}/gtk-4.0/gtk.css" "${THEME_BUILD_DIR}" - rm -f "${THEME_BUILD_DIR}/_global.scss" - install_theme "${THEME_BUILD_DIR}" "$2" "$3" -} - -COLOR_SCHEME="" -INSTALL_TARGET="" -THEME_NAME="" -COLOR_SCHEME_ROOT="/usr/share/color-schemes" - -while [ "$#" -gt 0 ]; do - case "$1" in - -h|--help) - echo "$0: build Breeze theme" - echo "Usage: $0 [-c COLOR_SCHEME] [-r COLOR_SCHEME_ROOT] [-t TARGET_DIRECTORY]" - echo - echo "Arguments:" - echo " -h, --help show this help" - echo " -c COLOR_SCHEME use color scheme with name COLOR_SCHEME. If unset or" - echo " empty, the value from ~/.config/kdeglobals is used" - echo " -r COLOR_SCHEME_ROOT The base path of all color schemes or" - echo " /usr/share/color-schemes if unset" - echo " -t TARGET_DIRECTORY the directory to install the color scheme. If unset or" - echo " empty, it is installed into" - echo " ~/.local/share/themes/THEME_NAME" - exit 0 - ;; - -c) - shift - COLOR_SCHEME="$1" - ;; - -t) - shift - INSTALL_TARGET="$1" - ;; - -r) - shift - COLOR_SCHEME_ROOT="$1" - ;; - esac - shift -done - -if [ -z "${COLOR_SCHEME}" ]; then - THEME_NAME="Breeze" - if [ -f "${HOME}/.config/kdeglobals" ]; then - COLOR_SCHEME="${HOME}/.config/kdeglobals" - else - echo "${HOME}/.config/kdeglobals not found, using defaults" - COLOR_SCHEME="${COLOR_SCHEME_ROOT}/Breeze.colors" - fi -else - THEME_NAME="${COLOR_SCHEME}" - if [ -f "${COLOR_SCHEME_ROOT}/${COLOR_SCHEME}.colors" ]; then - COLOR_SCHEME="${COLOR_SCHEME_ROOT}/${COLOR_SCHEME}.colors" - elif [ -f "${HOME}/.local/share/color-schemes/${COLOR_SCHEME}.colors" ]; then - COLOR_SCHEME="${HOME}/.local/share/color-schemes/${COLOR_SCHEME}.colors" - else - echo "colorscheme ${COLOR_SCHEME} not found" - exit 1 - fi -fi - -render_theme "${COLOR_SCHEME}" "${THEME_NAME}" "${INSTALL_TARGET}" "${COLOR_SCHEME_ROOT}/Breeze.colors" -[ -z "${INSTALL_TARGET}" ] && INSTALL_TARGET="${HOME}/.local/share/themes/${THEME_NAME}" -cp -r assets/ "${INSTALL_TARGET}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/breeze-gtk-5.22.5/src/build_theme.sh.cmake new/breeze-gtk-5.23.0/src/build_theme.sh.cmake --- old/breeze-gtk-5.22.5/src/build_theme.sh.cmake 1970-01-01 01:00:00.000000000 +0100 +++ new/breeze-gtk-5.23.0/src/build_theme.sh.cmake 2021-10-07 13:30:17.000000000 +0200 @@ -0,0 +1,113 @@ +#!/bin/sh +set -e + +# Usage: create_folders <target-directory> +create_folders () { + for j in gtk-2.0 gtk-3.0 gtk-4.0; do + if ! [ -d "$1/$j" ]; then + mkdir -p "$1/$j" + fi + done +} + +# Usage: build_sass <source-directory> <target-directory> <include-directory> +build_sass() { + if command -v sassc >/dev/null 2>&1; then + sassc -I "$3" "$1" "$2" + else + sass -I "$3" --cache-location /tmp/sass-cache "$1" "$2" + fi +} + +# Usage: install_theme <theme-directory> <theme-name> <install-target-dir> +# If <install-target-dir> is unset or empty, install to $HOME/.local/share/themes/$THEME_NAME +install_theme () { + THEME_INSTALL_TARGET="$3" + if [ -z "${THEME_INSTALL_TARGET}" ]; then + THEME_INSTALL_TARGET="${HOME}/.local/share/themes/$2" + fi + echo "Installing into ${THEME_INSTALL_TARGET}" + mkdir -p "${THEME_INSTALL_TARGET}" + for dir in assets gtk-2.0 gtk-3.0 gtk-4.0; do + if [ -d "${THEME_INSTALL_TARGET}/$dir" ]; then + rm -rf "${THEME_INSTALL_TARGET:?}/$dir" + fi + mv -f "$1/$dir" "${THEME_INSTALL_TARGET}" + done + rmdir "$1" +} + +# Usage render_theme <colorscheme> <theme-name> <theme-install-target> <colorschemebase> +render_theme () { + THEME_BUILD_DIR="$(mktemp -d)" + create_folders "${THEME_BUILD_DIR}" + cp -R gtk2/* "${THEME_BUILD_DIR}/gtk-2.0/" + @PYTHON_EXECUTABLE@ render_assets.py -c "$1" -a "${THEME_BUILD_DIR}/assets" \ + -g "${THEME_BUILD_DIR}/gtk-2.0" -G "${THEME_BUILD_DIR}" -b "$4" + build_sass gtk3/gtk.scss "${THEME_BUILD_DIR}/gtk-3.0/gtk.css" "${THEME_BUILD_DIR}" + build_sass gtk4/gtk.scss "${THEME_BUILD_DIR}/gtk-4.0/gtk.css" "${THEME_BUILD_DIR}" + rm -f "${THEME_BUILD_DIR}/_global.scss" + install_theme "${THEME_BUILD_DIR}" "$2" "$3" +} + +COLOR_SCHEME="" +INSTALL_TARGET="" +THEME_NAME="" +COLOR_SCHEME_ROOT="/usr/share/color-schemes" + +while [ "$#" -gt 0 ]; do + case "$1" in + -h|--help) + echo "$0: build Breeze theme" + echo "Usage: $0 [-c COLOR_SCHEME] [-r COLOR_SCHEME_ROOT] [-t TARGET_DIRECTORY]" + echo + echo "Arguments:" + echo " -h, --help show this help" + echo " -c COLOR_SCHEME use color scheme with name COLOR_SCHEME. If unset or" + echo " empty, the value from ~/.config/kdeglobals is used" + echo " -r COLOR_SCHEME_ROOT The base path of all color schemes or" + echo " /usr/share/color-schemes if unset" + echo " -t TARGET_DIRECTORY the directory to install the color scheme. If unset or" + echo " empty, it is installed into" + echo " ~/.local/share/themes/THEME_NAME" + exit 0 + ;; + -c) + shift + COLOR_SCHEME="$1" + ;; + -t) + shift + INSTALL_TARGET="$1" + ;; + -r) + shift + COLOR_SCHEME_ROOT="$1" + ;; + esac + shift +done + +if [ -z "${COLOR_SCHEME}" ]; then + THEME_NAME="Breeze" + if [ -f "${HOME}/.config/kdeglobals" ]; then + COLOR_SCHEME="${HOME}/.config/kdeglobals" + else + echo "${HOME}/.config/kdeglobals not found, using defaults" + COLOR_SCHEME="${COLOR_SCHEME_ROOT}/BreezeLight.colors" + fi +else + THEME_NAME="${COLOR_SCHEME}" + if [ -f "${COLOR_SCHEME_ROOT}/${COLOR_SCHEME}.colors" ]; then + COLOR_SCHEME="${COLOR_SCHEME_ROOT}/${COLOR_SCHEME}.colors" + elif [ -f "${HOME}/.local/share/color-schemes/${COLOR_SCHEME}.colors" ]; then + COLOR_SCHEME="${HOME}/.local/share/color-schemes/${COLOR_SCHEME}.colors" + else + echo "colorscheme ${COLOR_SCHEME} not found" + exit 1 + fi +fi + +render_theme "${COLOR_SCHEME}" "${THEME_NAME}" "${INSTALL_TARGET}" "${COLOR_SCHEME_ROOT}/BreezeLight.colors" +[ -z "${INSTALL_TARGET}" ] && INSTALL_TARGET="${HOME}/.local/share/themes/${THEME_NAME}" +cp -r assets/ "${INSTALL_TARGET}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/breeze-gtk-5.22.5/src/gtk3/widgets/_button.scss new/breeze-gtk-5.23.0/src/gtk3/widgets/_button.scss --- old/breeze-gtk-5.22.5/src/gtk3/widgets/_button.scss 2021-08-31 13:30:38.000000000 +0200 +++ new/breeze-gtk-5.23.0/src/gtk3/widgets/_button.scss 2021-10-07 13:30:17.000000000 +0200 @@ -40,16 +40,22 @@ // // 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 { + 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); + } @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 @@ -170,7 +176,6 @@ @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 @@ -223,15 +228,12 @@ } &.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 { @@ -355,7 +357,6 @@ &.flat:backdrop, &.flat:disabled, &.flat:backdrop:disabled { - @include button(undecorated); color: gtkalpha($button_color, 0.8); } &:disabled { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/breeze-gtk-5.22.5/src/gtk3/widgets/_headerbar.scss new/breeze-gtk-5.23.0/src/gtk3/widgets/_headerbar.scss --- old/breeze-gtk-5.22.5/src/gtk3/widgets/_headerbar.scss 2021-08-31 13:30:38.000000000 +0200 +++ new/breeze-gtk-5.23.0/src/gtk3/widgets/_headerbar.scss 2021-10-07 13:30:17.000000000 +0200 @@ -53,10 +53,8 @@ } &:active, &:checked { - @include button(active); - &:hover { - @include button(active-hover); - } + @include button(titlebar-active); + color: gtk("@theme_titlebar_foreground"); &:backdrop { background-image: none; background-color: gtk("@theme_titlebar_background_backdrop"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/breeze-gtk-5.22.5/src/gtk4/widgets/_button.scss new/breeze-gtk-5.23.0/src/gtk4/widgets/_button.scss --- old/breeze-gtk-5.22.5/src/gtk4/widgets/_button.scss 2021-08-31 13:30:38.000000000 +0200 +++ new/breeze-gtk-5.23.0/src/gtk4/widgets/_button.scss 2021-10-07 13:30:17.000000000 +0200 @@ -42,21 +42,29 @@ } @else if $t==active { - // - // pushed button - // - color: gtk("@theme_button_foreground_active"); - border-color: gtk("@theme_button_decoration_focus"); - background-color: gtk("@theme_button_decoration_focus"); + // + // 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); } @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 -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/breeze-gtk-5.22.5/src/gtk4/widgets/_headerbar.scss new/breeze-gtk-5.23.0/src/gtk4/widgets/_headerbar.scss --- old/breeze-gtk-5.22.5/src/gtk4/widgets/_headerbar.scss 2021-08-31 13:30:38.000000000 +0200 +++ new/breeze-gtk-5.23.0/src/gtk4/widgets/_headerbar.scss 2021-10-07 13:30:17.000000000 +0200 @@ -50,7 +50,8 @@ } } &:active, &:checked { - @include button(active); + @include button(titlebar-active); + color: gtk("@theme_titlebar_foreground"); &:hover { @include button(active-hover); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/breeze-gtk-5.22.5/src/render_assets.py new/breeze-gtk-5.23.0/src/render_assets.py --- old/breeze-gtk-5.22.5/src/render_assets.py 2021-08-31 13:30:38.000000000 +0200 +++ new/breeze-gtk-5.23.0/src/render_assets.py 2021-10-07 13:30:17.000000000 +0200 @@ -693,10 +693,10 @@ description='Generates Breeze assets according to the specified color ' 'scheme.') parser.add_argument('--colorscheme', '-c', action='store', - default='/usr/share/color-schemes/Breeze.colors', + default='/usr/share/color-schemes/BreezeLight.colors', help='color scheme to use') parser.add_argument('--basecolorscheme', '-b', action='store', - default='/usr/share/color-schemes/Breeze.colors', + default='/usr/share/color-schemes/BreezeLight.colors', help='base color scheme') parser.add_argument('--assets-dir', '-a', action='store', ++++++ plasma.keyring ++++++ Binary files /var/tmp/diff_new_pack.ErChhK/_old and /var/tmp/diff_new_pack.ErChhK/_new differ
