Fixed the vscrollbar flickering problem, by checking the area on expose

Sat Mar  7 01:07:24 1998  Owen Taylor  <owt1@cornell.edu>

	* gtk/gtkrange.c (gtk_range_expose): Fixed the vscrollbar
	  flickering problem, by checking the area on expose events.
	  (There was a hscrollbar flickering problem as well, it
	   just wasn't very noticeable)

8 files changed, 65 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index d3584159f0..92ba1f3ddd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Mar  7 01:07:24 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gtk/gtkrange.c (gtk_range_expose): Fixed the vscrollbar
+	  flickering problem, by checking the area on expose events.
+	  (There was a hscrollbar flickering problem as well, it
+	   just wasn't very noticeable)
+
 Fri Mar  6 21:30:05 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkeditable.c: Disallow pasting into non-editable
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d3584159f0..92ba1f3ddd 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Sat Mar  7 01:07:24 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gtk/gtkrange.c (gtk_range_expose): Fixed the vscrollbar
+	  flickering problem, by checking the area on expose events.
+	  (There was a hscrollbar flickering problem as well, it
+	   just wasn't very noticeable)
+
 Fri Mar  6 21:30:05 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkeditable.c: Disallow pasting into non-editable
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d3584159f0..92ba1f3ddd 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Sat Mar  7 01:07:24 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gtk/gtkrange.c (gtk_range_expose): Fixed the vscrollbar
+	  flickering problem, by checking the area on expose events.
+	  (There was a hscrollbar flickering problem as well, it
+	   just wasn't very noticeable)
+
 Fri Mar  6 21:30:05 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkeditable.c: Disallow pasting into non-editable
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d3584159f0..92ba1f3ddd 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Sat Mar  7 01:07:24 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gtk/gtkrange.c (gtk_range_expose): Fixed the vscrollbar
+	  flickering problem, by checking the area on expose events.
+	  (There was a hscrollbar flickering problem as well, it
+	   just wasn't very noticeable)
+
 Fri Mar  6 21:30:05 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkeditable.c: Disallow pasting into non-editable
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d3584159f0..92ba1f3ddd 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Sat Mar  7 01:07:24 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gtk/gtkrange.c (gtk_range_expose): Fixed the vscrollbar
+	  flickering problem, by checking the area on expose events.
+	  (There was a hscrollbar flickering problem as well, it
+	   just wasn't very noticeable)
+
 Fri Mar  6 21:30:05 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkeditable.c: Disallow pasting into non-editable
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d3584159f0..92ba1f3ddd 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Sat Mar  7 01:07:24 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gtk/gtkrange.c (gtk_range_expose): Fixed the vscrollbar
+	  flickering problem, by checking the area on expose events.
+	  (There was a hscrollbar flickering problem as well, it
+	   just wasn't very noticeable)
+
 Fri Mar  6 21:30:05 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkeditable.c: Disallow pasting into non-editable
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d3584159f0..92ba1f3ddd 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Sat Mar  7 01:07:24 1998  Owen Taylor  <owt1@cornell.edu>
+
+	* gtk/gtkrange.c (gtk_range_expose): Fixed the vscrollbar
+	  flickering problem, by checking the area on expose events.
+	  (There was a hscrollbar flickering problem as well, it
+	   just wasn't very noticeable)
+
 Fri Mar  6 21:30:05 1998  Owen Taylor  <owt1@cornell.edu>
 
 	* gtk/gtkeditable.c: Disallow pasting into non-editable
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index db39373d18..95beaa0b44 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -688,7 +688,22 @@ gtk_range_expose (GtkWidget      *widget,
 
   if (event->window == range->trough)
     {
-      gtk_range_draw_trough (range);
+      /* Don't redraw if we are only exposing the literal trough region.
+       * this may not work correctly if someone overrides the default
+       * trough-drawing handler. (Probably should really pass another
+       * argument - the redrawn area to all the drawing functions)
+       */
+
+      gint xt = widget->style->klass->xthickness;
+      gint yt = widget->style->klass->ythickness;
+      
+      if (!((event->area.x >= xt) &&
+	    (event->area.y >= yt) &&
+	    (event->area.x + event->area.width <= 
+	     widget->allocation.width - xt) &&
+	    (event->area.y + event->area.height <= 
+	     widget->allocation.height - xt)))
+	gtk_range_draw_trough (range);
     }
   else if (event->window == widget->window)
     {