* gtkutil.c (xg_frame_cleared): Call gtk_widget_queue_draw for

[gnu-emacs] / src / gtkutil.c

diff --git a/src/gtkutil.c b/src/gtkutil.c
index d66b8523b188a208b7a7d338e4063df42069257e..61e797493541e724009bf9f569b1f29efba9494b 100644 (file)
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -293,11 +293,14 @@ void
 xg_frame_cleared (f)
      FRAME_PTR f;
 {
-  GtkWidget *wfixed = f->output_data.x->edit_widget;
+  GtkWidget *w = f->output_data.x->widget;
 
-  if (wfixed)
+  if (w)
     {
-      gtk_container_set_reallocate_redraws (GTK_CONTAINER (wfixed), TRUE);
+      gtk_container_set_reallocate_redraws (GTK_CONTAINER (w), TRUE);
+      gtk_container_foreach (GTK_CONTAINER (w),
+                             (GtkCallback) gtk_widget_queue_draw,
+                             0);
       gdk_window_process_all_updates ();
     }
 }
@@ -2625,6 +2628,7 @@ xg_set_toolkit_scroll_bar_thumb (bar, portion, position, whole)
       gdouble shown;
       gdouble top;
       int size, value;
+      int new_upper, new_step;
 
       adj = gtk_range_get_adjustment (GTK_RANGE (wscroll));
 
@@ -2652,21 +2656,33 @@ xg_set_toolkit_scroll_bar_thumb (bar, portion, position, whole)
       value = min (value, whole - size);
       value = max (value, XG_SB_MIN);
 
-      adj->page_size = (int)size;
-
       /* gtk_range_set_value invokes the callback.  Set
          ignore_gtk_scrollbar to make the callback do nothing  */
       xg_ignore_gtk_scrollbar = 1;
 
-      gtk_range_set_range (GTK_RANGE (wscroll), adj->lower, max (whole, size));
+      new_upper = max (whole, size);
+      new_step  =  portion / max (1, FRAME_HEIGHT (f));
+
+      if ((int) adj->page_size != size
+          || (int) adj->upper != new_upper
+          || (int) adj->step_increment != new_step)
+        {
+          adj->page_size = (int) size;
+
+          gtk_range_set_range (GTK_RANGE (wscroll), adj->lower,
+                               (gdouble) new_upper);
+
+          /* Assume all lines are of equal size.  */
+          /* Assume a page increment is about 95% of the page size  */
+          gtk_range_set_increments (GTK_RANGE (wscroll),
+                                    portion / max (1, FRAME_HEIGHT (f)),
+                                    (int) (0.95*adj->page_size));
+          
+        }
 
-      /* Assume all lines are of equal size.  */
-      /* Assume a page increment is about 95% of the page size  */
-      gtk_range_set_increments (GTK_RANGE (wscroll),
-                                portion / max (1, FRAME_HEIGHT (f)),
-                                (int) (0.95*adj->page_size));
+      if ((int) gtk_range_get_value (GTK_RANGE (wscroll)) != value)
+        gtk_range_set_value (GTK_RANGE (wscroll), (gdouble)value);
 
-      gtk_range_set_value (GTK_RANGE (wscroll), (gdouble)value);
       xg_ignore_gtk_scrollbar = 0;
 
       /* Make GTK draw the new thumb.  We are not using a pure GTK event