Chain up before drawing the scale values so that the number is drawn in

Tue Feb 26 19:32:42 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain
        up before drawing the scale values so that the number
        is drawn in the right place instead of one step
        back. (#61743, patch from Satyajit Kanungo)

diff --git a/ChangeLog b/ChangeLog
index 5943462795cf6e6873934ce71365c87764799b4c..27bce648be5a611a44d53c5b8b198a10b8e3e64a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Tue Feb 26 19:32:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain
+       up before drawing the scale values so that the number
+       is drawn in the right place instead of one step 
+       back. (#61743, patch from Satyajit Kanungo)
+
 Tue Feb 26 19:16:28 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): 

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 5943462795cf6e6873934ce71365c87764799b4c..27bce648be5a611a44d53c5b8b198a10b8e3e64a 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Tue Feb 26 19:32:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain
+       up before drawing the scale values so that the number
+       is drawn in the right place instead of one step 
+       back. (#61743, patch from Satyajit Kanungo)
+
 Tue Feb 26 19:16:28 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 5943462795cf6e6873934ce71365c87764799b4c..27bce648be5a611a44d53c5b8b198a10b8e3e64a 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Tue Feb 26 19:32:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain
+       up before drawing the scale values so that the number
+       is drawn in the right place instead of one step 
+       back. (#61743, patch from Satyajit Kanungo)
+
 Tue Feb 26 19:16:28 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): 

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 5943462795cf6e6873934ce71365c87764799b4c..27bce648be5a611a44d53c5b8b198a10b8e3e64a 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Tue Feb 26 19:32:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain
+       up before drawing the scale values so that the number
+       is drawn in the right place instead of one step 
+       back. (#61743, patch from Satyajit Kanungo)
+
 Tue Feb 26 19:16:28 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 5943462795cf6e6873934ce71365c87764799b4c..27bce648be5a611a44d53c5b8b198a10b8e3e64a 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Tue Feb 26 19:32:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain
+       up before drawing the scale values so that the number
+       is drawn in the right place instead of one step 
+       back. (#61743, patch from Satyajit Kanungo)
+
 Tue Feb 26 19:16:28 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 5943462795cf6e6873934ce71365c87764799b4c..27bce648be5a611a44d53c5b8b198a10b8e3e64a 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Tue Feb 26 19:32:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain
+       up before drawing the scale values so that the number
+       is drawn in the right place instead of one step 
+       back. (#61743, patch from Satyajit Kanungo)
+
 Tue Feb 26 19:16:28 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 5943462795cf6e6873934ce71365c87764799b4c..27bce648be5a611a44d53c5b8b198a10b8e3e64a 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Tue Feb 26 19:32:42 2002  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtk[hv]vscale.c (gtk_[hv]scale_expose): Chain
+       up before drawing the scale values so that the number
+       is drawn in the right place instead of one step 
+       back. (#61743, patch from Satyajit Kanungo)
+
 Tue Feb 26 19:16:28 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/win32/gdkkeys-win32.c (gdk_keyval_name): 

diff --git a/gtk/gtkhscale.c b/gtk/gtkhscale.c
index 537217bcb78f944828abc2aead90e52f8ab7f1a6..3d8df65d6984814ecaad1814a7e2a57c93276234 100644 (file)
--- a/gtk/gtkhscale.c
+++ b/gtk/gtkhscale.c
@@ -159,7 +159,13 @@ gtk_hscale_expose (GtkWidget      *widget,
   range = GTK_RANGE (widget);
   scale = GTK_SCALE (widget);
   hscale = GTK_HSCALE (widget);
-  
+
+  /* We need to chain up _first_ so the various geometry members of
+   * GtkRange struct are updated.
+   */
+  if (GTK_WIDGET_CLASS (parent_class)->expose_event)
+    GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+
   if (scale->draw_value)
     {
       PangoLayout *layout;
@@ -231,6 +237,6 @@ gtk_hscale_expose (GtkWidget      *widget,
 
       g_object_unref (G_OBJECT (layout));
     }
-
-  return (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
+  
+  return FALSE;
 }

diff --git a/gtk/gtkvscale.c b/gtk/gtkvscale.c
index 775f67023692227c566d4c51630c067489f21c62..9fa56f76efa8f5e274bbd9d3fc0cf67577544829 100644 (file)
--- a/gtk/gtkvscale.c
+++ b/gtk/gtkvscale.c
@@ -162,6 +162,12 @@ gtk_vscale_expose (GtkWidget      *widget,
   scale = GTK_SCALE (widget);
   vscale = GTK_VSCALE (widget);
   
+  /* We need to chain up _first_ so the various geometry members of
+   * GtkRange struct are updated.
+   */
+  if (GTK_WIDGET_CLASS (parent_class)->expose_event)
+    GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+
   if (scale->draw_value)
     {
       PangoLayout *layout;
@@ -232,5 +238,5 @@ gtk_vscale_expose (GtkWidget      *widget,
       g_object_unref (G_OBJECT (layout));
     }
   
-  return (* GTK_WIDGET_CLASS (parent_class)->expose_event) (widget, event);
+  return FALSE;
 }