Merge from HEAD.

2003-01-21  Matthias Clasen  <maclas@gmx.de>

	Merge from HEAD.

	* gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid
	unnecessary roundtrip failures.  (#93500)
This commit is contained in:
Matthias Clasen
2003-01-21 00:00:48 +00:00
committed by Matthias Clasen
parent 15f799d645
commit 02dbda7fac
6 changed files with 38 additions and 3 deletions

View File

@@ -1,3 +1,10 @@
2003-01-21 Matthias Clasen <maclas@gmx.de>
Merge from HEAD.
* gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid
unnecessary roundtrip failures. (#93500)
2003-01-20 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in: Added Amharic (am), Macedonian (mk)

View File

@@ -1,3 +1,10 @@
2003-01-21 Matthias Clasen <maclas@gmx.de>
Merge from HEAD.
* gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid
unnecessary roundtrip failures. (#93500)
2003-01-20 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in: Added Amharic (am), Macedonian (mk)

View File

@@ -1,3 +1,10 @@
2003-01-21 Matthias Clasen <maclas@gmx.de>
Merge from HEAD.
* gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid
unnecessary roundtrip failures. (#93500)
2003-01-20 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in: Added Amharic (am), Macedonian (mk)

View File

@@ -1,3 +1,10 @@
2003-01-21 Matthias Clasen <maclas@gmx.de>
Merge from HEAD.
* gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid
unnecessary roundtrip failures. (#93500)
2003-01-20 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in: Added Amharic (am), Macedonian (mk)

View File

@@ -1,3 +1,10 @@
2003-01-21 Matthias Clasen <maclas@gmx.de>
Merge from HEAD.
* gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid
unnecessary roundtrip failures. (#93500)
2003-01-20 Pablo Saratxaga <pablo@mandrakesoft.com>
* configure.in: Added Amharic (am), Macedonian (mk)

View File

@@ -1375,9 +1375,9 @@ hex_changed (GtkWidget *hex_entry,
text = gtk_editable_get_chars (GTK_EDITABLE (priv->hex_entry), 0, -1);
if (gdk_color_parse (text, &color))
{
priv->color[COLORSEL_RED] = CLAMP (color.red/65280.0, 0.0, 1.0);
priv->color[COLORSEL_GREEN] = CLAMP (color.green/65280.0, 0.0, 1.0);
priv->color[COLORSEL_BLUE] = CLAMP (color.blue/65280.0, 0.0, 1.0);
priv->color[COLORSEL_RED] = CLAMP (color.red/65535.0, 0.0, 1.0);
priv->color[COLORSEL_GREEN] = CLAMP (color.green/65535.0, 0.0, 1.0);
priv->color[COLORSEL_BLUE] = CLAMP (color.blue/65535.0, 0.0, 1.0);
gtk_rgb_to_hsv (priv->color[COLORSEL_RED],
priv->color[COLORSEL_GREEN],
priv->color[COLORSEL_BLUE],