dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use a GimpColorHexEntry widget. 

2005-03-24  Sven Neumann  <sven@gimp.org>

	* app/widgets/gimpcolormapeditor.c: use a GimpColorHexEntry widget.
This commit is contained in:
Sven Neumann 2005-03-24 15:29:48 +00:00 committed by Sven Neumann
parent dd4c196624
commit 13bd5eabe5
2 changed files with 15 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2005-03-24 Sven Neumann <sven@gimp.org>
* app/widgets/gimpcolormapeditor.c: use a GimpColorHexEntry widget.
2005-03-24 Sven Neumann <sven@gimp.org>
* plug-ins/bmp/bmpread.c: applied a patch from David Costanzo that

53
app/widgets/gimpcolormapeditor.c
View File

@ -120,10 +120,7 @@ static void gimp_colormap_preview_drop_color (GtkWidget *widget,
static void gimp_colormap_adjustment_changed (GtkAdjustment *adjustment,
GimpColormapEditor *editor);
static void gimp_colormap_hex_entry_activate (GtkEntry *entry,
GimpColormapEditor *editor);
static gboolean gimp_colormap_hex_entry_focus_out (GtkEntry *entry,
GdkEvent *event,
static void gimp_colormap_hex_entry_changed (GimpColorHexEntry *entry,
GimpColormapEditor *editor);
static void gimp_colormap_image_mode_changed (GimpImage *gimage,
@ -253,18 +250,14 @@ gimp_colormap_editor_init (GimpColormapEditor *editor)
G_CALLBACK (gimp_colormap_adjustment_changed),
editor);
editor->color_entry = gtk_entry_new ();
gtk_entry_set_width_chars (GTK_ENTRY (editor->color_entry), 8);
gtk_entry_set_max_length (GTK_ENTRY (editor->color_entry), 6);
editor->color_entry = gimp_color_hex_entry_new ();
gtk_entry_set_width_chars (GTK_ENTRY (editor->color_entry), 12);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1,
_("HTML notation:"), 0.0, 0.5,
editor->color_entry, 1, TRUE);
g_signal_connect (editor->color_entry, "activate",
G_CALLBACK (gimp_colormap_hex_entry_activate),
editor);
g_signal_connect (editor->color_entry, "focus_out_event",
G_CALLBACK (gimp_colormap_hex_entry_focus_out),
g_signal_connect (editor->color_entry, "color_changed",
G_CALLBACK (gimp_colormap_hex_entry_changed),
editor);
}
@ -797,46 +790,22 @@ gimp_colormap_adjustment_changed (GtkAdjustment *adjustment,
}
static void
gimp_colormap_hex_entry_activate (GtkEntry *entry,
GimpColormapEditor *editor)
gimp_colormap_hex_entry_changed (GimpColorHexEntry *entry,
GimpColormapEditor *editor)
{
GimpImage *gimage = GIMP_IMAGE_EDITOR (editor)->gimage;
if (gimage)
{
const gchar *s;
gulong i;
GimpRGB color;
s = gtk_entry_get_text (entry);
gimp_color_hex_entry_get_color (entry, &color);
if (sscanf (s, "%lx", &i))
{
GimpRGB color;
guchar r, g, b;
r = (i & 0xFF0000) >> 16;
g = (i & 0x00FF00) >> 8;
b = (i & 0x0000FF);
gimp_rgb_set_uchar (&color, r, g, b);
gimp_image_set_colormap_entry (gimage, editor->col_index, &color,
TRUE);
gimp_image_flush (gimage);
}
gimp_image_set_colormap_entry (gimage, editor->col_index, &color, TRUE);
gimp_image_flush (gimage);
}
}
static gboolean
gimp_colormap_hex_entry_focus_out (GtkEntry *entry,
GdkEvent *event,
GimpColormapEditor *editor)
{
gimp_colormap_hex_entry_activate (entry, editor);
return FALSE;
}
static void
gimp_colormap_image_mode_changed (GimpImage *gimage,
GimpColormapEditor *editor)