dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

invalidate the buffer when the widget's sensitivity changes. Draw a

Browse source 
2005-06-04  Sven Neumann  <sven@gimp.org>

	* libgimpwidgets/gimpcolorarea.[ch]: invalidate the buffer when
	the widget's sensitivity changes. Draw a stipple pattern on the
	insensitive color area.

	* libgimpwidgets/gimpcellrenderercolor.c: follow internal API change.

	* libgimpwidgets/gimpcolorbutton.c: pass GDK_BUTTON1_MASK as
	drag-mask. Doesn't work for whatever reason but it didn't work
	with GDK_BUTTON2_MASK either.
This commit is contained in:
Sven Neumann 2005-06-04 12:02:36 +00:00 committed by Sven Neumann
parent 525de1b084
commit 80d4e4f5b0
5 changed files with 70 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
2005-06-04 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpcolorarea.[ch]: invalidate the buffer when
the widget's sensitivity changes. Draw a stipple pattern on the
insensitive color area.
* libgimpwidgets/gimpcellrenderercolor.c: follow internal API change.
* libgimpwidgets/gimpcolorbutton.c: pass GDK_BUTTON1_MASK as
drag-mask. Doesn't work for whatever reason but it didn't work
with GDK_BUTTON2_MASK either.
2005-06-04 Michael Schumacher <schumaml@cvs.gnome.org> 2005-06-04 Michael Schumacher <schumaml@cvs.gnome.org>
* plug-ins/common/webbrowser.c: use GetDesktopWindow() and SW_SHOW * plug-ins/common/webbrowser.c: use GetDesktopWindow() and SW_SHOW

3
libgimpwidgets/gimpcellrenderercolor.c
View file

@ -277,7 +277,8 @@ gimp_cell_renderer_color_render (GtkCellRenderer *cell,
buf = g_alloca (rowstride * (rect.height - 2)); buf = g_alloca (rowstride * (rect.height - 2));
_gimp_color_area_render_buf ((color->opaque ? _gimp_color_area_render_buf (widget,
(color->opaque ?
GIMP_COLOR_AREA_FLAT : GIMP_COLOR_AREA_FLAT :
GIMP_COLOR_AREA_SMALL_CHECKS), GIMP_COLOR_AREA_SMALL_CHECKS),
buf, buf,

68
libgimpwidgets/gimpcolorarea.c
View file

@ -67,6 +67,8 @@ static void gimp_color_area_finalize (GObject *object);
static void gimp_color_area_size_allocate (GtkWidget *widget, static void gimp_color_area_size_allocate (GtkWidget *widget,
GtkAllocation *allocation); GtkAllocation *allocation);
static void gimp_color_area_state_changed (GtkWidget *widget,
GtkStateType previous_state);
static gboolean gimp_color_area_expose (GtkWidget *widget, static gboolean gimp_color_area_expose (GtkWidget *widget,
GdkEventExpose *event); GdkEventExpose *event);
static void gimp_color_area_render (GimpColorArea *area); static void gimp_color_area_render (GimpColorArea *area);
@ -147,6 +149,7 @@ gimp_color_area_class_init (GimpColorAreaClass *klass)
object_class->finalize = gimp_color_area_finalize; object_class->finalize = gimp_color_area_finalize;
widget_class->size_allocate = gimp_color_area_size_allocate; widget_class->size_allocate = gimp_color_area_size_allocate;
widget_class->state_changed = gimp_color_area_state_changed;
widget_class->expose_event = gimp_color_area_expose; widget_class->expose_event = gimp_color_area_expose;
widget_class->drag_begin = gimp_color_area_drag_begin; widget_class->drag_begin = gimp_color_area_drag_begin;
@ -333,6 +336,20 @@ gimp_color_area_size_allocate (GtkWidget *widget,
} }
} }
static void
gimp_color_area_state_changed (GtkWidget *widget,
GtkStateType previous_state)
{
if (widget->state == GTK_STATE_INSENSITIVE ||
previous_state == GTK_STATE_INSENSITIVE)
{
GIMP_COLOR_AREA (widget)->needs_render = TRUE;
}
if (GTK_WIDGET_CLASS (parent_class)->state_changed)
GTK_WIDGET_CLASS (parent_class)->state_changed (widget, previous_state);
}
static gboolean static gboolean
gimp_color_area_expose (GtkWidget *widget, gimp_color_area_expose (GtkWidget *widget,
GdkEventExpose *event) GdkEventExpose *event)
@ -340,7 +357,7 @@ gimp_color_area_expose (GtkWidget *widget,
GimpColorArea *area = GIMP_COLOR_AREA (widget); GimpColorArea *area = GIMP_COLOR_AREA (widget);
guchar *buf; guchar *buf;
if (! area->buf || !GTK_WIDGET_DRAWABLE (widget)) if (! area->buf || ! GTK_WIDGET_DRAWABLE (widget))
return FALSE; return FALSE;
if (area->needs_render) if (area->needs_render)
@ -510,7 +527,8 @@ gimp_color_area_set_draw_border (GimpColorArea *area,
} }
void void
_gimp_color_area_render_buf (GimpColorAreaType type, _gimp_color_area_render_buf (GtkWidget *widget,
GimpColorAreaType type,
guchar *buf, guchar *buf,
guint width, guint width,
guint height, guint height,
@ -522,9 +540,14 @@ _gimp_color_area_render_buf (GimpColorAreaType type,
guchar light[3]; guchar light[3];
guchar dark[3]; guchar dark[3];
guchar opaque[3]; guchar opaque[3];
guchar insensitive[3];
guchar *p; guchar *p;
gdouble frac; gdouble frac;
g_return_if_fail (GTK_IS_WIDGET (widget));
g_return_if_fail (buf != NULL);
g_return_if_fail (color != NULL);
switch (type) switch (type)
{ {
case GIMP_COLOR_AREA_FLAT: case GIMP_COLOR_AREA_FLAT:
@ -542,7 +565,11 @@ _gimp_color_area_render_buf (GimpColorAreaType type,
gimp_rgb_get_uchar (color, opaque, opaque + 1, opaque + 2); gimp_rgb_get_uchar (color, opaque, opaque + 1, opaque + 2);
if (color->a == 1.0 || !check_size) insensitive[0] = widget->style->bg[GTK_STATE_INSENSITIVE].red >> 8;
insensitive[1] = widget->style->bg[GTK_STATE_INSENSITIVE].green >> 8;
insensitive[2] = widget->style->bg[GTK_STATE_INSENSITIVE].blue >> 8;
if (check_size == 0 || color->a == 1.0 || ! GTK_WIDGET_IS_SENSITIVE (widget))
{ {
for (y = 0; y < height; y++) for (y = 0; y < height; y++)
{ {
@ -550,9 +577,18 @@ _gimp_color_area_render_buf (GimpColorAreaType type,
for (x = 0; x < width; x++) for (x = 0; x < width; x++)
{ {
*p++ = opaque[0]; if ((! GTK_WIDGET_IS_SENSITIVE (widget)) && ((x + y) % 2))
*p++ = opaque[1]; {
*p++ = opaque[2]; *p++ = insensitive[0];
*p++ = insensitive[1];
*p++ = insensitive[2];
}
else
{
*p++ = opaque[0];
*p++ = opaque[1];
*p++ = opaque[2];
}
} }
} }
@ -561,16 +597,17 @@ _gimp_color_area_render_buf (GimpColorAreaType type,
light[0] = (GIMP_CHECK_LIGHT + light[0] = (GIMP_CHECK_LIGHT +
(color->r - GIMP_CHECK_LIGHT) * color->a) * 255.999; (color->r - GIMP_CHECK_LIGHT) * color->a) * 255.999;
dark[0] = (GIMP_CHECK_DARK +
(color->r - GIMP_CHECK_DARK) * color->a) * 255.999;
light[1] = (GIMP_CHECK_LIGHT + light[1] = (GIMP_CHECK_LIGHT +
(color->g - GIMP_CHECK_LIGHT) * color->a) * 255.999; (color->g - GIMP_CHECK_LIGHT) * color->a) * 255.999;
dark[1] = (GIMP_CHECK_DARK +
(color->g - GIMP_CHECK_DARK) * color->a) * 255.999;
light[2] = (GIMP_CHECK_LIGHT + light[2] = (GIMP_CHECK_LIGHT +
(color->b - GIMP_CHECK_LIGHT) * color->a) * 255.999; (color->b - GIMP_CHECK_LIGHT) * color->a) * 255.999;
dark[2] = (GIMP_CHECK_DARK +
(color->b - GIMP_CHECK_DARK) * color->a) * 255.999; dark[0] = (GIMP_CHECK_DARK +
(color->r - GIMP_CHECK_DARK) * color->a) * 255.999;
dark[1] = (GIMP_CHECK_DARK +
(color->g - GIMP_CHECK_DARK) * color->a) * 255.999;
dark[2] = (GIMP_CHECK_DARK +
(color->b - GIMP_CHECK_DARK) * color->a) * 255.999;
for (y = 0; y < height; y++) for (y = 0; y < height; y++)
{ {
@ -631,15 +668,16 @@ _gimp_color_area_render_buf (GimpColorAreaType type,
static void static void
gimp_color_area_render (GimpColorArea *area) gimp_color_area_render (GimpColorArea *area)
{ {
area->needs_render = FALSE;
if (! area->buf) if (! area->buf)
return; return;
_gimp_color_area_render_buf (area->type, _gimp_color_area_render_buf (GTK_WIDGET (area),
area->type,
area->buf, area->buf,
area->width, area->height, area->rowstride, area->width, area->height, area->rowstride,
&area->color); &area->color);
area->needs_render = FALSE;
} }
static void static void

3
libgimpwidgets/gimpcolorarea.h
View file

@ -90,7 +90,8 @@ void gimp_color_area_set_draw_border (GimpColorArea *area,
gboolean draw_border); gboolean draw_border);
/* only for private use in libgimpwidgets */ /* only for private use in libgimpwidgets */
void _gimp_color_area_render_buf (GimpColorAreaType type, void _gimp_color_area_render_buf (GtkWidget *widget,
GimpColorAreaType type,
guchar *buf, guchar *buf,
guint width, guint width,
guint height, guint height,

2
libgimpwidgets/gimpcolorbutton.c
View file

@ -265,7 +265,7 @@ gimp_color_button_init (GimpColorButton *button,
button->dialog = NULL; button->dialog = NULL;
button->color_area = g_object_new (GIMP_TYPE_COLOR_AREA, button->color_area = g_object_new (GIMP_TYPE_COLOR_AREA,
"drag-mask", GDK_BUTTON2_MASK, "drag-mask", GDK_BUTTON1_MASK,
NULL); NULL);
g_signal_connect (button->color_area, "color-changed", g_signal_connect (button->color_area, "color-changed",