From d355451c516218b8ec7ff4dc439817a559252225 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 26 Jan 1999 00:28:13 +0000 Subject: [PATCH] Back out the last solution to updating problem. And try a different one Mon Jan 25 19:00:13 1999 Owen Taylor * gtk/gtkcolorsel.c (gtk_color_selection_value_events): Back out the last solution to updating problem. And try a different one that is less dependent on the state of the widget. Just redraw the value_marker when it gets mapped. Somebody needs to analyze this widget more carefully and figure out --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtkcolorsel.c | 13 ++++++++----- 8 files changed, 71 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7d2ef73628..af4978a4ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +Mon Jan 25 19:00:13 1999 Owen Taylor + + * gtk/gtkcolorsel.c (gtk_color_selection_value_events): + Back out the last solution to updating problem. And + try a different one that is less dependent on + the state of the widget. Just redraw the value_marker + when it gets mapped. Somebody needs to analyze + this widget more carefully and figure out + Mon Jan 25 17:48:03 1999 Owen Taylor * gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE() diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 7d2ef73628..af4978a4ba 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +Mon Jan 25 19:00:13 1999 Owen Taylor + + * gtk/gtkcolorsel.c (gtk_color_selection_value_events): + Back out the last solution to updating problem. And + try a different one that is less dependent on + the state of the widget. Just redraw the value_marker + when it gets mapped. Somebody needs to analyze + this widget more carefully and figure out + Mon Jan 25 17:48:03 1999 Owen Taylor * gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE() diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7d2ef73628..af4978a4ba 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +Mon Jan 25 19:00:13 1999 Owen Taylor + + * gtk/gtkcolorsel.c (gtk_color_selection_value_events): + Back out the last solution to updating problem. And + try a different one that is less dependent on + the state of the widget. Just redraw the value_marker + when it gets mapped. Somebody needs to analyze + this widget more carefully and figure out + Mon Jan 25 17:48:03 1999 Owen Taylor * gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE() diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7d2ef73628..af4978a4ba 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +Mon Jan 25 19:00:13 1999 Owen Taylor + + * gtk/gtkcolorsel.c (gtk_color_selection_value_events): + Back out the last solution to updating problem. And + try a different one that is less dependent on + the state of the widget. Just redraw the value_marker + when it gets mapped. Somebody needs to analyze + this widget more carefully and figure out + Mon Jan 25 17:48:03 1999 Owen Taylor * gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE() diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7d2ef73628..af4978a4ba 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +Mon Jan 25 19:00:13 1999 Owen Taylor + + * gtk/gtkcolorsel.c (gtk_color_selection_value_events): + Back out the last solution to updating problem. And + try a different one that is less dependent on + the state of the widget. Just redraw the value_marker + when it gets mapped. Somebody needs to analyze + this widget more carefully and figure out + Mon Jan 25 17:48:03 1999 Owen Taylor * gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE() diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7d2ef73628..af4978a4ba 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +Mon Jan 25 19:00:13 1999 Owen Taylor + + * gtk/gtkcolorsel.c (gtk_color_selection_value_events): + Back out the last solution to updating problem. And + try a different one that is less dependent on + the state of the widget. Just redraw the value_marker + when it gets mapped. Somebody needs to analyze + this widget more carefully and figure out + Mon Jan 25 17:48:03 1999 Owen Taylor * gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE() diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7d2ef73628..af4978a4ba 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +Mon Jan 25 19:00:13 1999 Owen Taylor + + * gtk/gtkcolorsel.c (gtk_color_selection_value_events): + Back out the last solution to updating problem. And + try a different one that is less dependent on + the state of the widget. Just redraw the value_marker + when it gets mapped. Somebody needs to analyze + this widget more carefully and figure out + Mon Jan 25 17:48:03 1999 Owen Taylor * gtk/gtkcolorsel.c: Removed some GTK_WIDGET_DRAWABLE() diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c index 540aafa4df..79618e74d8 100644 --- a/gtk/gtkcolorsel.c +++ b/gtk/gtkcolorsel.c @@ -490,11 +490,12 @@ gtk_color_selection_set_color (GtkColorSelection *colorsel, gtk_color_selection_update_inputs (colorsel, RGB_INPUTS | HSV_INPUTS | OPACITY_INPUTS, BOTH); - gtk_color_selection_draw_value_bar (colorsel, FALSE); - gtk_color_selection_draw_sample (colorsel, FALSE); - if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (colorsel))) - gtk_color_selection_draw_wheel_marker (colorsel); + { + gtk_color_selection_draw_value_bar (colorsel, FALSE); + gtk_color_selection_draw_sample (colorsel, FALSE); + gtk_color_selection_draw_wheel_marker (colorsel); + } } void @@ -818,7 +819,8 @@ gtk_color_selection_set_opacity (GtkColorSelection *colorsel, gtk_widget_show (colorsel->entries[OPACITY]); } - gtk_color_selection_draw_sample (colorsel, FALSE); + if (GTK_WIDGET_DRAWABLE (colorsel->sample_area)) + gtk_color_selection_draw_sample (colorsel, FALSE); } static void @@ -1052,6 +1054,7 @@ gtk_color_selection_value_events (GtkWidget *area, switch (event->type) { case GDK_MAP: + gtk_color_selection_draw_value_bar (colorsel, FALSE); gtk_color_selection_draw_value_marker (colorsel); break; case GDK_EXPOSE: