Take arrows into account when clamping the offset. Fixes #95758.

Thu Oct 17 22:09:05 2002  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtkmenu.c (gtk_menu_scroll_to): Take arrows into
	account when clamping the offset. Fixes #95758.

diff --git a/ChangeLog b/ChangeLog
index 1de90bc0be8b0ec8a821dc3b94672180434b24cf..0d9b2f1a9a2501ff9d4d592d86977e6a6c6e2517 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Oct 17 22:09:05 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_scroll_to): Take arrows into
+       account when clamping the offset. Fixes #95758.
+
 Wed Oct 16 15:19:44 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c: Fix from Phil Blundell for

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1de90bc0be8b0ec8a821dc3b94672180434b24cf..0d9b2f1a9a2501ff9d4d592d86977e6a6c6e2517 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Oct 17 22:09:05 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_scroll_to): Take arrows into
+       account when clamping the offset. Fixes #95758.
+
 Wed Oct 16 15:19:44 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c: Fix from Phil Blundell for

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1de90bc0be8b0ec8a821dc3b94672180434b24cf..0d9b2f1a9a2501ff9d4d592d86977e6a6c6e2517 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Oct 17 22:09:05 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_scroll_to): Take arrows into
+       account when clamping the offset. Fixes #95758.
+
 Wed Oct 16 15:19:44 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c: Fix from Phil Blundell for

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1de90bc0be8b0ec8a821dc3b94672180434b24cf..0d9b2f1a9a2501ff9d4d592d86977e6a6c6e2517 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Oct 17 22:09:05 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_scroll_to): Take arrows into
+       account when clamping the offset. Fixes #95758.
+
 Wed Oct 16 15:19:44 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c: Fix from Phil Blundell for

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1de90bc0be8b0ec8a821dc3b94672180434b24cf..0d9b2f1a9a2501ff9d4d592d86977e6a6c6e2517 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Oct 17 22:09:05 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_scroll_to): Take arrows into
+       account when clamping the offset. Fixes #95758.
+
 Wed Oct 16 15:19:44 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c: Fix from Phil Blundell for

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1de90bc0be8b0ec8a821dc3b94672180434b24cf..0d9b2f1a9a2501ff9d4d592d86977e6a6c6e2517 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Oct 17 22:09:05 2002  Soeren Sandmann  <sandmann@daimi.au.dk>
+
+       * gtk/gtkmenu.c (gtk_menu_scroll_to): Take arrows into
+       account when clamping the offset. Fixes #95758.
+
 Wed Oct 16 15:19:44 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gdk/x11/gdkkeys-x11.c: Fix from Phil Blundell for

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 321c4ddcabc00846388d254031039d7f0f861ad4..f9f8d152c5b280565597bd37b7a5877e53446103 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2538,12 +2538,6 @@ gtk_menu_scroll_to (GtkMenu *menu,
   view_height -= (border_width + widget->style->ythickness) * 2;
   menu_height = widget->requisition.height - (border_width + widget->style->ythickness) * 2;
 
-  offset = CLAMP (offset, 0, menu_height - view_height);
-
-  /* Scroll the menu: */
-  if (GTK_WIDGET_REALIZED (menu))
-    gdk_window_move (menu->bin_window, 0, -offset);
-
   x = border_width + widget->style->xthickness;
   y = border_width + widget->style->ythickness;
   
@@ -2585,6 +2579,12 @@ gtk_menu_scroll_to (GtkMenu *menu,
        y += MENU_SCROLL_ARROW_HEIGHT;
     }
 
+  offset = CLAMP (offset, 0, menu_height - view_height);
+
+  /* Scroll the menu: */
+  if (GTK_WIDGET_REALIZED (menu))
+    gdk_window_move (menu->bin_window, 0, -offset);
+
   if (GTK_WIDGET_REALIZED (menu))
     gdk_window_move_resize (menu->view_window,
                            x,