diff --git a/ChangeLog b/ChangeLog index 1092fc22e0..8aaebd85aa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-01-21 Matthias Clasen + + * gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid + unnecessary roundtrip failures. (#93500) + 2003-01-19 Tor Lillqvist Merge from stable: @@ -220,7 +225,7 @@ Wed Jan 8 18:43:03 2003 Manish Singh (selection_motion_event_handler): (selection_scan_timeout): Support select-by-words/lines. (gtk_text_view_button_press_event): Start a selection drag on - double/triple clicks. (#78599) + double/triple clicks. (#78499) 2003-01-06 Matthias Clasen diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1092fc22e0..8aaebd85aa 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2003-01-21 Matthias Clasen + + * gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid + unnecessary roundtrip failures. (#93500) + 2003-01-19 Tor Lillqvist Merge from stable: @@ -220,7 +225,7 @@ Wed Jan 8 18:43:03 2003 Manish Singh (selection_motion_event_handler): (selection_scan_timeout): Support select-by-words/lines. (gtk_text_view_button_press_event): Start a selection drag on - double/triple clicks. (#78599) + double/triple clicks. (#78499) 2003-01-06 Matthias Clasen diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1092fc22e0..8aaebd85aa 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2003-01-21 Matthias Clasen + + * gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid + unnecessary roundtrip failures. (#93500) + 2003-01-19 Tor Lillqvist Merge from stable: @@ -220,7 +225,7 @@ Wed Jan 8 18:43:03 2003 Manish Singh (selection_motion_event_handler): (selection_scan_timeout): Support select-by-words/lines. (gtk_text_view_button_press_event): Start a selection drag on - double/triple clicks. (#78599) + double/triple clicks. (#78499) 2003-01-06 Matthias Clasen diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1092fc22e0..8aaebd85aa 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2003-01-21 Matthias Clasen + + * gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid + unnecessary roundtrip failures. (#93500) + 2003-01-19 Tor Lillqvist Merge from stable: @@ -220,7 +225,7 @@ Wed Jan 8 18:43:03 2003 Manish Singh (selection_motion_event_handler): (selection_scan_timeout): Support select-by-words/lines. (gtk_text_view_button_press_event): Start a selection drag on - double/triple clicks. (#78599) + double/triple clicks. (#78499) 2003-01-06 Matthias Clasen diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1092fc22e0..8aaebd85aa 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2003-01-21 Matthias Clasen + + * gtk/gtkcolorsel.c (hex_changed): Fix clamping to [0,1] to avoid + unnecessary roundtrip failures. (#93500) + 2003-01-19 Tor Lillqvist Merge from stable: @@ -220,7 +225,7 @@ Wed Jan 8 18:43:03 2003 Manish Singh (selection_motion_event_handler): (selection_scan_timeout): Support select-by-words/lines. (gtk_text_view_button_press_event): Start a selection drag on - double/triple clicks. (#78599) + double/triple clicks. (#78499) 2003-01-06 Matthias Clasen 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],