rpms/gtk-nodoka-engine/F-12 gtk-nodoka-engine-0.7.2-honor-transparent-bg-hint.patch, NONE, 1.1 gtk-nodoka-engine.spec, 1.31, 1.32
Martin Sourada
mso at fedoraproject.org
Sat Jan 23 13:56:33 UTC 2010
Author: mso
Update of /cvs/pkgs/rpms/gtk-nodoka-engine/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22982/F-12
Modified Files:
gtk-nodoka-engine.spec
Added Files:
gtk-nodoka-engine-0.7.2-honor-transparent-bg-hint.patch
Log Message:
Honor GtkEntry::transparent-bg-hint (rhbz #489111).
gtk-nodoka-engine-0.7.2-honor-transparent-bg-hint.patch:
GTKEngine/nodoka_draw.c | 12 ------------
GTKEngine/nodoka_style.c | 14 ++++++++++++++
GTKThemes/Nodoka-Aqua/gtk-2.0/gtkrc | 1 +
GTKThemes/Nodoka-Gilouche/gtk-2.0/gtkrc | 1 +
GTKThemes/Nodoka-Looks/gtk-2.0/gtkrc | 1 +
GTKThemes/Nodoka-Midnight/gtk-2.0/gtkrc | 1 +
GTKThemes/Nodoka-Rounded/gtk-2.0/gtkrc | 1 +
GTKThemes/Nodoka-Silver/gtk-2.0/gtkrc | 1 +
GTKThemes/Nodoka-Squared/gtk-2.0/gtkrc | 1 +
GTKThemes/Nodoka/gtk-2.0/gtkrc | 1 +
10 files changed, 22 insertions(+), 12 deletions(-)
--- NEW FILE gtk-nodoka-engine-0.7.2-honor-transparent-bg-hint.patch ---
diff --git a/gtk-nodoka-engine/src/GTKEngine/nodoka_draw.c b/gtk-nodoka-engine/src/GTKEngine/nodoka_draw.c
index 60b23b5..de8f97f 100644
--- a/gtk-nodoka-engine/src/GTKEngine/nodoka_draw.c
+++ b/gtk-nodoka-engine/src/GTKEngine/nodoka_draw.c
@@ -405,12 +405,6 @@ nodoka_draw_entry (cairo_t * cr,
cairo_translate (cr, x + 0.5, y + 0.5);
cairo_set_line_width (cr, 1.0);
- /* Fill the background (shouldn't have to) */
- cairo_rectangle (cr, -0.5, -0.5, width, height);
- cairo_set_source_rgb (cr, widget->parentbg.r, widget->parentbg.g,
- widget->parentbg.b);
- cairo_fill (cr);
-
/* Fill the entry's base color */
nodoka_rounded_rectangle (cr, 0.5, 0.5, width - 2, height - 2, widget->roundness, widget->corners);
cairo_set_source_rgb (cr, base->r, base->g, base->b);
@@ -644,12 +638,6 @@ nodoka_draw_progressbar_trough (cairo_t * cr, const NodokaColors * colors,
cairo_translate (cr, x, y);
- /* Fill the background (shouldn't have to) */
- cairo_rectangle (cr, -0.5, -0.5, width + 1, height + 1);
- cairo_set_source_rgb (cr, widget->parentbg.r, widget->parentbg.g,
- widget->parentbg.b);
- cairo_fill (cr);
-
cairo_set_line_width (cr, 1.0);
diff --git a/gtk-nodoka-engine/src/GTKEngine/nodoka_style.c b/gtk-nodoka-engine/src/GTKEngine/nodoka_style.c
index 7d73eb3..48aa242 100644
--- a/gtk-nodoka-engine/src/GTKEngine/nodoka_style.c
+++ b/gtk-nodoka-engine/src/GTKEngine/nodoka_style.c
@@ -297,6 +297,13 @@ nodoka_style_draw_shadow (DRAW_ARGS)
if (params.roundness <= 0)
params.corners = NDK_CORNER_NONE;
+ if (!widget || !g_object_get_data (G_OBJECT (widget), "transparent-bg-hint"))
+ {
+ cairo_rectangle(cr, 0, 0, width, height);
+ cairo_set_source_rgb(cr, params.parentbg.r, params.parentbg.g, params.parentbg.b);
+ cairo_fill(cr);
+ }
+
nodoka_draw_entry (cr, &nodoka_style->colors, ¶ms, &entry, x, y, width,
height);
}
@@ -766,6 +773,13 @@ nodoka_style_draw_box (DRAW_ARGS)
else
params.corners = NDK_CORNER_NONE;
+ if (!widget || !g_object_get_data (G_OBJECT (widget), "transparent-bg-hint"))
+ {
+ cairo_rectangle(cr, 0, 0, width, height);
+ cairo_set_source_rgb(cr, params.parentbg.r, params.parentbg.g, params.parentbg.b);
+ cairo_fill(cr);
+ }
+
nodoka_draw_progressbar_trough (cr, colors, ¶ms, &progressbar, x, y, width,
height);
}
diff --git a/gtk-nodoka-engine/src/GTKThemes/Nodoka-Aqua/gtk-2.0/gtkrc b/gtk-nodoka-engine/src/GTKThemes/Nodoka-Aqua/gtk-2.0/gtkrc
index 39e001c..fdfddb4 100644
--- a/gtk-nodoka-engine/src/GTKThemes/Nodoka-Aqua/gtk-2.0/gtkrc
+++ b/gtk-nodoka-engine/src/GTKThemes/Nodoka-Aqua/gtk-2.0/gtkrc
@@ -24,6 +24,7 @@ style "fedora-default"
GtkScale::trough-side-details = 1
GtkPaned::handle_size = 6
+ GtkEntry::honors-transparent-bg-hint = 1
GtkScrollbar::min_slider_length = 40
GtkCheckButton::indicator_size = 13
diff --git a/gtk-nodoka-engine/src/GTKThemes/Nodoka-Gilouche/gtk-2.0/gtkrc b/gtk-nodoka-engine/src/GTKThemes/Nodoka-Gilouche/gtk-2.0/gtkrc
index 64c74fc..8ce0efb 100644
--- a/gtk-nodoka-engine/src/GTKThemes/Nodoka-Gilouche/gtk-2.0/gtkrc
+++ b/gtk-nodoka-engine/src/GTKThemes/Nodoka-Gilouche/gtk-2.0/gtkrc
@@ -24,6 +24,7 @@ style "fedora-default"
GtkScale::trough-side-details = 1
GtkPaned::handle_size = 6
+ GtkEntry::honors-transparent-bg-hint = 1
GtkScrollbar::min_slider_length = 40
GtkCheckButton::indicator_size = 13
diff --git a/gtk-nodoka-engine/src/GTKThemes/Nodoka-Looks/gtk-2.0/gtkrc b/gtk-nodoka-engine/src/GTKThemes/Nodoka-Looks/gtk-2.0/gtkrc
index 4cf56c3..ec00f4d 100644
--- a/gtk-nodoka-engine/src/GTKThemes/Nodoka-Looks/gtk-2.0/gtkrc
+++ b/gtk-nodoka-engine/src/GTKThemes/Nodoka-Looks/gtk-2.0/gtkrc
@@ -24,6 +24,7 @@ style "fedora-default"
GtkScale::trough-side-details = 1
GtkPaned::handle_size = 6
+ GtkEntry::honors-transparent-bg-hint = 1
GtkScrollbar::min_slider_length = 40
GtkCheckButton::indicator_size = 13
diff --git a/gtk-nodoka-engine/src/GTKThemes/Nodoka-Midnight/gtk-2.0/gtkrc b/gtk-nodoka-engine/src/GTKThemes/Nodoka-Midnight/gtk-2.0/gtkrc
index e76c1bb..38c9465 100644
--- a/gtk-nodoka-engine/src/GTKThemes/Nodoka-Midnight/gtk-2.0/gtkrc
+++ b/gtk-nodoka-engine/src/GTKThemes/Nodoka-Midnight/gtk-2.0/gtkrc
@@ -24,6 +24,7 @@ style "fedora-default"
GtkScale::trough-side-details = 1
GtkPaned::handle_size = 6
+ GtkEntry::honors-transparent-bg-hint = 1
GtkScrollbar::min_slider_length = 40
GtkCheckButton::indicator_size = 13
diff --git a/gtk-nodoka-engine/src/GTKThemes/Nodoka-Rounded/gtk-2.0/gtkrc b/gtk-nodoka-engine/src/GTKThemes/Nodoka-Rounded/gtk-2.0/gtkrc
index 5e3090a..a8fa636 100644
--- a/gtk-nodoka-engine/src/GTKThemes/Nodoka-Rounded/gtk-2.0/gtkrc
+++ b/gtk-nodoka-engine/src/GTKThemes/Nodoka-Rounded/gtk-2.0/gtkrc
@@ -24,6 +24,7 @@ style "fedora-default"
GtkScale::trough-side-details = 1
GtkPaned::handle_size = 6
+ GtkEntry::honors-transparent-bg-hint = 1
GtkScrollbar::min_slider_length = 40
GtkCheckButton::indicator_size = 13
diff --git a/gtk-nodoka-engine/src/GTKThemes/Nodoka-Silver/gtk-2.0/gtkrc b/gtk-nodoka-engine/src/GTKThemes/Nodoka-Silver/gtk-2.0/gtkrc
index ab10463..c31d024 100644
--- a/gtk-nodoka-engine/src/GTKThemes/Nodoka-Silver/gtk-2.0/gtkrc
+++ b/gtk-nodoka-engine/src/GTKThemes/Nodoka-Silver/gtk-2.0/gtkrc
@@ -24,6 +24,7 @@ style "fedora-default"
GtkScale::trough-side-details = 1
GtkPaned::handle_size = 6
+ GtkEntry::honors-transparent-bg-hint = 1
GtkScrollbar::min_slider_length = 40
GtkCheckButton::indicator_size = 13
diff --git a/gtk-nodoka-engine/src/GTKThemes/Nodoka-Squared/gtk-2.0/gtkrc b/gtk-nodoka-engine/src/GTKThemes/Nodoka-Squared/gtk-2.0/gtkrc
index 9c3b22d..650074b 100644
--- a/gtk-nodoka-engine/src/GTKThemes/Nodoka-Squared/gtk-2.0/gtkrc
+++ b/gtk-nodoka-engine/src/GTKThemes/Nodoka-Squared/gtk-2.0/gtkrc
@@ -24,6 +24,7 @@ style "fedora-default"
GtkScale::trough-side-details = 1
GtkPaned::handle_size = 6
+ GtkEntry::honors-transparent-bg-hint = 1
GtkScrollbar::min_slider_length = 40
GtkCheckButton::indicator_size = 13
diff --git a/gtk-nodoka-engine/src/GTKThemes/Nodoka/gtk-2.0/gtkrc b/gtk-nodoka-engine/src/GTKThemes/Nodoka/gtk-2.0/gtkrc
index b08459c..9ebffa8 100644
--- a/gtk-nodoka-engine/src/GTKThemes/Nodoka/gtk-2.0/gtkrc
+++ b/gtk-nodoka-engine/src/GTKThemes/Nodoka/gtk-2.0/gtkrc
@@ -24,6 +24,7 @@ style "fedora-default"
GtkScale::trough-side-details = 1
GtkPaned::handle_size = 6
+ GtkEntry::honors-transparent-bg-hint = 1
GtkScrollbar::min_slider_length = 40
GtkCheckButton::indicator_size = 13
Index: gtk-nodoka-engine.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gtk-nodoka-engine/F-12/gtk-nodoka-engine.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- gtk-nodoka-engine.spec 10 Jan 2010 20:49:16 -0000 1.31
+++ gtk-nodoka-engine.spec 23 Jan 2010 13:56:33 -0000 1.32
@@ -3,7 +3,7 @@
Name: gtk-nodoka-engine
Version: 0.7.2
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: The Nodoka GTK Theme Engine
Group: System Environment/Libraries
@@ -14,6 +14,7 @@ Patch0: %{name}-scale-trough.pat
Patch1: %{name}-handle-selection.patch
Patch2: %{name}-0.7.2-missing-widget-check.patch
Patch3: %{name}-0.7.2-grey-out-checkboxes.patch
+Patch4: %{name}-0.7.2-honor-transparent-bg-hint.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: gtk2-devel
@@ -43,6 +44,7 @@ This package contains extra themes fot t
%patch1 -p1 -b .handle-selection
%patch2 -p1 -b .missing-widget-check
%patch3 -p1 -b .grey-out-checkboxes
+%patch4 -p2
%build
%configure
@@ -74,6 +76,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Sat Jan 23 2010 Martin Sourada <mso at fedoraproject.org> - 0.7.2-8
+- Honor GtkEntry::transparent-bg-hint (rhbz #489111)
+
* Sun Jan 10 2010 Martin Sourada <mso at fedoraproject.org> - 0.7.2-7
- Fix source URL
More information about the scm-commits
mailing list