eUgEntOptIc44/gimp
1
1
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-10-05 21:02:42 +02:00
Code Issues Releases Activity

libgimpwidgets: Update hex color as you type

Browse Source 
This patch connects the gimp_color_hex_entry_events ()
function to "key-release-event" and adjusts the code
to update valid colors as you type. Pressing Enter
will work as before, converting back to the last valid
color if an invalid one is typed.
This commit is contained in:
Alx Sa
2025-09-25 11:48:17 +00:00
parent 0af9261980
commit 23a9758a7b
1 changed files with 47 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
libgimpwidgets/gimpcolorhexentry.c
View File

@@ -163,16 +163,19 @@ gimp_color_hex_entry_init (GimpColorHexEntry *entry)
gtk_entry_set_completion (GTK_ENTRY (entry), completion);
g_object_unref (completion);
g_signal_connect (entry, "focus-out-event",
G_CALLBACK (gimp_color_hex_entry_events),
NULL);
g_signal_connect (entry, "key-press-event",
G_CALLBACK (gimp_color_hex_entry_events),
NULL);
g_signal_connect_object (entry, "focus-out-event",
G_CALLBACK (gimp_color_hex_entry_events),
NULL, 0);
g_signal_connect_object (entry, "key-press-event",
G_CALLBACK (gimp_color_hex_entry_events),
NULL, 0);
g_signal_connect_object (entry, "key-release-event",
G_CALLBACK (gimp_color_hex_entry_events),
NULL, 0);
g_signal_connect (completion, "match-selected",
G_CALLBACK (gimp_color_hex_entry_matched),
entry);
g_signal_connect_object (completion, "match-selected",
G_CALLBACK (gimp_color_hex_entry_matched),
entry, 0);
}
static void
@@ -263,7 +266,8 @@ static gboolean
gimp_color_hex_entry_events (GtkWidget *widget,
GdkEvent *event)
{
GimpColorHexEntry *entry = GIMP_COLOR_HEX_ENTRY (widget);
GimpColorHexEntry *entry = GIMP_COLOR_HEX_ENTRY (widget);
gboolean check_color = FALSE;
switch (event->type)
{
@@ -271,39 +275,52 @@ gimp_color_hex_entry_events (GtkWidget *widget,
{
GdkEventKey *kevent = (GdkEventKey *) event;
if (kevent->keyval != GDK_KEY_Return &&
kevent->keyval != GDK_KEY_KP_Enter &&
kevent->keyval != GDK_KEY_ISO_Enter)
break;
/* else fall through */
if (kevent->keyval == GDK_KEY_Return ||
kevent->keyval == GDK_KEY_KP_Enter ||
kevent->keyval == GDK_KEY_ISO_Enter)
check_color = TRUE;
}
case GDK_KEY_RELEASE:
case GDK_FOCUS_CHANGE:
{
const gchar *text;
gchar buffer[8];
guchar rgb[3];
gsize len;
text = gtk_entry_get_text (GTK_ENTRY (widget));
len = strlen (text);
gegl_color_get_pixel (entry->color, babl_format ("R'G'B' u8"), rgb);
g_snprintf (buffer, sizeof (buffer), "%.2x%.2x%.2x", rgb[0], rgb[1], rgb[2]);
if (g_ascii_strcasecmp (buffer, text) != 0)
if (len >= 6 || check_color)
{
GeglColor *color = NULL;
gsize len = strlen (text);
gegl_color_get_pixel (entry->color, babl_format ("R'G'B' u8"),
rgb);
g_snprintf (buffer, sizeof (buffer), "%.2x%.2x%.2x",
rgb[0], rgb[1], rgb[2]);
if (len > 0 &&
((color = gimp_color_parse_hex_substring (text, len)) ||
(color = gimp_color_parse_name (text))))
if (g_ascii_strcasecmp (buffer, text) != 0)
{
gimp_color_hex_entry_set_color (entry, color);
g_object_unref (color);
}
else
{
gtk_entry_set_text (GTK_ENTRY (entry), buffer);
GeglColor *color = NULL;
gint position;
position = gtk_editable_get_position (GTK_EDITABLE (widget));
if (len > 0 &&
((color = gimp_color_parse_hex_substring (text, len)) ||
(color = gimp_color_parse_name (text))))
{
gimp_color_hex_entry_set_color (entry, color);
g_object_unref (color);
if (! check_color)
gtk_editable_set_position (GTK_EDITABLE (entry),
position);
}
else if (event->type == GDK_FOCUS_CHANGE || check_color)
{
gtk_entry_set_text (GTK_ENTRY (entry), buffer);
}
}
}
}