From 02dbda7faca92bd620260f63df98c4856af72ea8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 21 Jan 2003 00:00:48 +0000 Subject: [PATCH] Merge from HEAD. 2003-01-21 Matthias Clasen Merge from HEAD. * gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid unnecessary roundtrip failures. (#93500) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtkcolorsel.c | 6 +++--- 6 files changed, 38 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ea0f9f58e3..cafff64081 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2003-01-21 Matthias Clasen + + Merge from HEAD. + + * gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid + unnecessary roundtrip failures. (#93500) + 2003-01-20 Pablo Saratxaga * configure.in: Added Amharic (am), Macedonian (mk) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ea0f9f58e3..cafff64081 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2003-01-21 Matthias Clasen + + Merge from HEAD. + + * gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid + unnecessary roundtrip failures. (#93500) + 2003-01-20 Pablo Saratxaga * configure.in: Added Amharic (am), Macedonian (mk) diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ea0f9f58e3..cafff64081 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +2003-01-21 Matthias Clasen + + Merge from HEAD. + + * gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid + unnecessary roundtrip failures. (#93500) + 2003-01-20 Pablo Saratxaga * configure.in: Added Amharic (am), Macedonian (mk) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ea0f9f58e3..cafff64081 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2003-01-21 Matthias Clasen + + Merge from HEAD. + + * gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid + unnecessary roundtrip failures. (#93500) + 2003-01-20 Pablo Saratxaga * configure.in: Added Amharic (am), Macedonian (mk) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ea0f9f58e3..cafff64081 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2003-01-21 Matthias Clasen + + Merge from HEAD. + + * gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid + unnecessary roundtrip failures. (#93500) + 2003-01-20 Pablo Saratxaga * configure.in: Added Amharic (am), Macedonian (mk) diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index a5cdd0f348..c0d9def65d 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -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],