[bluebird] Upstream fix for checkboxes and radios in gtk3.14
Kevin Fenzi
kevin at fedoraproject.org
Sun Nov 9 20:30:36 UTC 2014
commit a50b6bd3f235856b09b7ab73a36efd867df93c03
Author: Kevin Fenzi <kevin at scrye.com>
Date: Sun Nov 9 13:30:17 2014 -0700
Upstream fix for checkboxes and radios in gtk3.14
- The "shadow" is re-enabled, the full size of the app menu in the system tray
is resolved upstream - gtkmenu: fix unnecessary scroll buttons gtk-3-14
https://git.gnome.org/browse/gtk+/commit/?h=gtk-3-14&id=695ff38
- The same applies to the Shimmer Project Desktop Suites for Xfce as a whole,
i.e. Greybird, Bluebird and Albatross.
- With these two corrections bugs #1114161, #1139190 and #1139187
are solved completely.
Fix-checkboxes-and-radios-for-Gtk3.14.patch | 176 +++++++++++++++++++++++++++
bluebird-1.2-gtk3-fixes.patch | 146 ----------------------
bluebird.spec | 18 +++-
3 files changed, 191 insertions(+), 149 deletions(-)
---
diff --git a/Fix-checkboxes-and-radios-for-Gtk3.14.patch b/Fix-checkboxes-and-radios-for-Gtk3.14.patch
new file mode 100644
index 0000000..f318f28
--- /dev/null
+++ b/Fix-checkboxes-and-radios-for-Gtk3.14.patch
@@ -0,0 +1,176 @@
+From a3560d877dfc57991a951cbd69b168887ece349c Mon Sep 17 00:00:00 2001
+From: Simon Steinbeiss <simon.steinbeiss at elfenbeinturm.at>
+Date: Fri, 7 Nov 2014 10:42:07 +0100
+Subject: [PATCH] Fix checkboxes and radios for Gtk3.14 (thanks poma)
+
+---
+ gtk-3.0/gtk-widgets-assets.css | 84 +++++++++++++++++++++---------------------
+ 1 file changed, 42 insertions(+), 42 deletions(-)
+
+diff --git a/gtk-3.0/gtk-widgets-assets.css b/gtk-3.0/gtk-widgets-assets.css
+index 41ebc52..0f3415e 100644
+--- a/gtk-3.0/gtk-widgets-assets.css
++++ b/gtk-3.0/gtk-widgets-assets.css
+@@ -5,120 +5,120 @@
+ .check,
+ .check row:selected,
+ .check row:selected:focus {
+- background-image: url("assets/checkbox-unchecked.png");
++ -gtk-icon-source: url("assets/checkbox-unchecked.png");
+ }
+
+ .check:insensitive,
+ .check row:selected:insensitive,
+ .check row:selected:focus:insensitive {
+- background-image: url("assets/checkbox-unchecked-insensitive.png");
++ -gtk-icon-source: url("assets/checkbox-unchecked-insensitive.png");
+ }
+
+-.check:active,
+-.check row:selected:active,
+-.check row:selected:focus:active {
+- background-image: url("assets/checkbox-checked.png");
++.check:active, .check:checked,
++.check row:selected:active, .check row:selected:checked,
++.check row:selected:focus:active, .check row:selected:focus:checked {
++ -gtk-icon-source: url("assets/checkbox-checked.png");
+ }
+
+-.check:active:insensitive,
+-.check row:selected:active:insensitive,
+-.check row:selected:focus:active:insensitive {
+- background-image: url("assets/checkbox-checked-insensitive.png");
++.check:active:insensitive, .check:checked:insensitive,
++.check row:selected:active:insensitive, .check row:selected:checked:insensitive,
++.check row:selected:focus:active:insensitive, .check row:selected:focus:checked:insensitive {
++ -gtk-icon-source: url("assets/checkbox-checked-insensitive.png");
+ }
+
+ .check:inconsistent,
+ .check row:selected:inconsistent,
+ .check row:selected:focus:inconsistent {
+- background-image: url("assets/checkbox-mixed.png");
++ -gtk-icon-source: url("assets/checkbox-mixed.png");
+ }
+
+ .check:inconsistent:insensitive,
+ .check row:selected:inconsistent:insensitive,
+ .check row:selected:focus:inconsistent:insensitive {
+- background-image: url("assets/checkbox-mixed-insensitive.png");
++ -gtk-icon-source: url("assets/checkbox-mixed-insensitive.png");
+ }
+
+ .radio,
+ .radio row:selected,
+ .radio row:selected:focus {
+- background-image: url("assets/radio-unselected.png");
++ -gtk-icon-source: url("assets/radio-unselected.png");
+ }
+
+ .radio:insensitive,
+ .radio row:selected:insensitive,
+ .radio row:selected:focus:insensitive {
+- background-image: url("assets/radio-unselected-insensitive.png");
++ -gtk-icon-source: url("assets/radio-unselected-insensitive.png");
+ }
+
+-.radio:active,
+-.radio row:selected:active,
+-.radio row:selected:focus:active {
+- background-image: url("assets/radio-selected.png");
++.radio:active, .radio:checked,
++.radio row:selected:active, .radio row:selected:checked,
++.radio row:selected:focus:active, .radio row:selected:focus:checked {
++ -gtk-icon-source: url("assets/radio-selected.png");
+ }
+
+-.radio:active:insensitive,
+-.radio row:selected:active:insensitive,
+-.radio row:selected:focus:active:insensitive {
+- background-image: url("assets/radio-selected-insensitive.png");
++.radio:active:insensitive, .radio:checked:insensitive,
++.radio row:selected:active:insensitive, .radio row:selected:checked:insensitive,
++.radio row:selected:focus:active:insensitive, .radio row:selected:focus:checked:insensitive {
++ -gtk-icon-source: url("assets/radio-selected-insensitive.png");
+ }
+
+ .radio:inconsistent,
+ .radio row:selected:inconsistent,
+ .radio row:selected:focus:inconsistent {
+- background-image: url("assets/radio-mixed.png");
++ -gtk-icon-source: url("assets/radio-mixed.png");
+ }
+
+ .radio:inconsistent:insensitive,
+ .radio row:selected:inconsistent:insensitive,
+ .radio row:selected:focus:inconsistent:insensitive {
+- background-image: url("assets/radio-mixed-insensitive.png");
++ -gtk-icon-source: url("assets/radio-mixed-insensitive.png");
+ }
+
+-.menuitem.check:active {
+- background-image: url("assets/menuitem-checkbox-checked.png");
++.menuitem.check:active, .menuitem.check:checked {
++ -gtk-icon-source: url("assets/menuitem-checkbox-checked.png");
+ }
+
+-.menuitem.check:active:hover {
+- background-image: url("assets/menuitem-checkbox-checked-hover.png");
++.menuitem.check:active:hover, .menuitem.check:checked:hover {
++ -gtk-icon-source: url("assets/menuitem-checkbox-checked-hover.png");
+ }
+
+-.menuitem.check:active:insensitive {
+- background-image: url("assets/menuitem-checkbox-checked-insensitive.png");
++.menuitem.check:active:insensitive, .menuitem.check:checked:insensitive {
++ -gtk-icon-source: url("assets/menuitem-checkbox-checked-insensitive.png");
+ }
+
+ .menuitem.check:inconsistent:hover,
+ .menuitem.radio:inconsistent:hover {
+- background-image: url("assets/menuitem-checkbox-mixed-hover.png");
++ -gtk-icon-source: url("assets/menuitem-checkbox-mixed-hover.png");
+ }
+
+ .menuitem.check:inconsistent,
+ .menuitem.radio:inconsistent {
+- background-image: url("assets/menuitem-checkbox-mixed.png");
++ -gtk-icon-source: url("assets/menuitem-checkbox-mixed.png");
+ }
+
+ .menuitem.check:inconsistent:insensitive,
+ .menuitem.radio:inconsistent:insensitive {
+- background-image: url("assets/menuitem-checkbox-mixed-insensitive.png");
++ -gtk-icon-source: url("assets/menuitem-checkbox-mixed-insensitive.png");
+ }
+
+-.menuitem.radio:active {
+- background-image: url("assets/menuitem-radio-checked.png");
++.menuitem.radio:active, .menuitem.radio:checked {
++ -gtk-icon-source: url("assets/menuitem-radio-checked.png");
+ }
+
+-.menuitem.radio:active:hover {
+- background-image: url("assets/menuitem-radio-checked-hover.png");
++.menuitem.radio:active:hover, .menuitem.radio:checked:hover {
++ -gtk-icon-source: url("assets/menuitem-radio-checked-hover.png");
+ }
+
+-.menuitem.radio:active:insensitive {
+- background-image: url("assets/menuitem-radio-checked-insensitive.png");
++.menuitem.radio:active:insensitive, .menuitem.radio:checked:insensitive {
++ -gtk-icon-source: url("assets/menuitem-radio-checked-insensitive.png");
+ }
+
+ GtkIconView.content-view.cell.check {
+- background-image: url("assets/grid-selection-unchecked.png");
++ -gtk-icon-source: url("assets/grid-selection-unchecked.png");
+ }
+
+-GtkIconView.content-view.cell.check:active {
+- background-image: url("assets/grid-selection-checked.png");
++GtkIconView.content-view.cell.check:active, GtkIconView.content-view.cell.check:checked {
++ -gtk-icon-source: url("assets/grid-selection-checked.png");
+ }
+
+ /***************
diff --git a/bluebird.spec b/bluebird.spec
index 755d244..3c5c557 100644
--- a/bluebird.spec
+++ b/bluebird.spec
@@ -2,14 +2,16 @@
Name: bluebird
Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A clean minimalistic theme for Xfce, GTK+ 2 and 3
License: GPLv2+ or CC-BY-SA
URL: http://shimmerproject.org/project/%{name}/
Source0: https://github.com/shimmerproject/%{theme_name}/archive/v%{version}.tar.gz
-Patch0: bluebird-1.2-gtk3-fixes.patch
-
+# Fix checkboxes and radios for Gtk3.14
+# https://github.com/shimmerproject/Bluebird/commit/a3560d
+# https://github.com/shimmerproject/Bluebird/commit/a3560d.patch
+Patch0: Fix-checkboxes-and-radios-for-Gtk3.14.patch
BuildArch: noarch
@@ -94,6 +96,16 @@ cp -pr gtk-2.0/ gtk-3.0/ metacity-1/ xfwm4/ %{buildroot}%{_datadir}/themes/%{the
%changelog
+* Sat Nov 08 2014 poma <poma at gmail.com> 1.2-2
+- Upstream fix for checkboxes and radios in gtk3.14
+- The "shadow" is re-enabled, the full size of the app menu in the system tray
+ is resolved upstream - gtkmenu: fix unnecessary scroll buttons gtk-3-14
+ https://git.gnome.org/browse/gtk+/commit/?h=gtk-3-14&id=695ff38
+- The same applies to the Shimmer Project Desktop Suites for Xfce as a whole,
+ i.e. Greybird, Bluebird and Albatross.
+- With these two corrections bugs #1114161, #1139190 and #1139187
+ are solved completely.
+
* Fri Oct 03 2014 Kevin Fenzi <kevin at scrye.com> 1.2-1
- Update to 1.2
- Add patch for issues with latest gtk3. Thanks poma
More information about the scm-commits
mailing list