[gimp/gtk3-port: 179/234] app: port GimpColorFrame away from GtkStyle, using a new style property
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gtk3-port: 179/234] app: port GimpColorFrame away from GtkStyle, using a new style property
- Date: Wed, 30 Mar 2016 21:17:02 +0000 (UTC)
commit b113b6efb4a026d895a8d8427b10186bbc4a55a9
Author: Michael Natterer <mitch gimp org>
Date: Sun Feb 6 17:18:47 2011 +0100
app: port GimpColorFrame away from GtkStyle, using a new style property
app/widgets/gimpcolorframe.c | 22 ++++++++++++++++++++--
themes/Default/gimp.css | 4 ++++
themes/Small/gimp.css | 4 ++++
3 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/app/widgets/gimpcolorframe.c b/app/widgets/gimpcolorframe.c
index fd9214e..b5dca58 100644
--- a/app/widgets/gimpcolorframe.c
+++ b/app/widgets/gimpcolorframe.c
@@ -108,6 +108,12 @@ gimp_color_frame_class_init (GimpColorFrameClass *klass)
NULL, NULL,
FALSE,
GIMP_PARAM_READWRITE));
+
+ gtk_widget_class_install_style_property (widget_class,
+ g_param_spec_boxed ("number-color",
+ NULL, NULL,
+ GDK_TYPE_RGBA,
+ GIMP_PARAM_READWRITE));
}
static void
@@ -272,19 +278,29 @@ gimp_color_frame_draw (GtkWidget *widget,
if (frame->has_number)
{
- GtkStyle *style = gtk_widget_get_style (widget);
GtkAllocation allocation;
GtkAllocation menu_allocation;
GtkAllocation color_area_allocation;
+ GdkRGBA *color;
gchar buf[8];
gint w, h;
gdouble scale;
+ cairo_save (cr);
+
gtk_widget_get_allocation (widget, &allocation);
gtk_widget_get_allocation (frame->menu, &menu_allocation);
gtk_widget_get_allocation (frame->color_area, &color_area_allocation);
- gdk_cairo_set_source_color (cr, &style->light[GTK_STATE_NORMAL]);
+ gtk_widget_style_get (widget,
+ "number-color", &color,
+ NULL);
+
+ if (color)
+ {
+ gdk_cairo_set_source_rgba (cr, color);
+ gdk_rgba_free (color);
+ }
g_snprintf (buf, sizeof (buf), "%d", frame->number);
@@ -307,6 +323,8 @@ gimp_color_frame_draw (GtkWidget *widget,
menu_allocation.height / 2.0 +
color_area_allocation.height / 2.0) / scale - h / 2.0);
pango_cairo_show_layout (cr, frame->number_layout);
+
+ cairo_restore (cr);
}
return GTK_WIDGET_CLASS (parent_class)->draw (widget, cr);
diff --git a/themes/Default/gimp.css b/themes/Default/gimp.css
index cb6aa45..58cc23c 100644
--- a/themes/Default/gimp.css
+++ b/themes/Default/gimp.css
@@ -64,6 +64,10 @@ GimpDisplayShell {
-GtkButton-focus-padding: 0;
}
+GimpColorFrame {
+ -GimpColorFrame-number-color: lighter (@bg_color);
+}
+
GimpOverlayFrame {
-GtkButton-focus-line-width: 1;
}
diff --git a/themes/Small/gimp.css b/themes/Small/gimp.css
index a8ceef6..f513c5e 100644
--- a/themes/Small/gimp.css
+++ b/themes/Small/gimp.css
@@ -64,6 +64,10 @@ GimpDisplayShell {
-GtkButton-focus-padding: 0;
}
+GimpColorFrame {
+ -GimpColorFrame-number-color: lighter (@bg_color);
+}
+
GimpOverlayFrame {
-GtkButton-focus-line-width: 1;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]