If the menu is scrolled down or up, and some of the widget area is empty,

* gtk/gtkmenu.c (gtk_menu_paint): If the menu is scrolled down or
up, and some of the widget area is empty, don't fill it in with
GTK_SHADOW_IN rectangles that make it looks strange.  Fixes
#72695.

diff --git a/ChangeLog b/ChangeLog
index 65f6dd728086b3156b115a363e36d37a3fc43b97..0900f89e97db64ecbface230f37d7d7d6df82ba2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-05-16  Ettore Perazzoli  <ettore@ximian.com>
+
+       * gtk/gtkmenu.c (gtk_menu_paint): If the menu is scrolled down or
+       up, and some of the widget area is empty, don't fill it in with
+       GTK_SHADOW_IN rectangles that make it looks strange.  Fixes
+       #72695.
+
 Wed May 15 18:15:45 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 65f6dd728086b3156b115a363e36d37a3fc43b97..0900f89e97db64ecbface230f37d7d7d6df82ba2 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2002-05-16  Ettore Perazzoli  <ettore@ximian.com>
+
+       * gtk/gtkmenu.c (gtk_menu_paint): If the menu is scrolled down or
+       up, and some of the widget area is empty, don't fill it in with
+       GTK_SHADOW_IN rectangles that make it looks strange.  Fixes
+       #72695.
+
 Wed May 15 18:15:45 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 65f6dd728086b3156b115a363e36d37a3fc43b97..0900f89e97db64ecbface230f37d7d7d6df82ba2 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2002-05-16  Ettore Perazzoli  <ettore@ximian.com>
+
+       * gtk/gtkmenu.c (gtk_menu_paint): If the menu is scrolled down or
+       up, and some of the widget area is empty, don't fill it in with
+       GTK_SHADOW_IN rectangles that make it looks strange.  Fixes
+       #72695.
+
 Wed May 15 18:15:45 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 65f6dd728086b3156b115a363e36d37a3fc43b97..0900f89e97db64ecbface230f37d7d7d6df82ba2 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2002-05-16  Ettore Perazzoli  <ettore@ximian.com>
+
+       * gtk/gtkmenu.c (gtk_menu_paint): If the menu is scrolled down or
+       up, and some of the widget area is empty, don't fill it in with
+       GTK_SHADOW_IN rectangles that make it looks strange.  Fixes
+       #72695.
+
 Wed May 15 18:15:45 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 65f6dd728086b3156b115a363e36d37a3fc43b97..0900f89e97db64ecbface230f37d7d7d6df82ba2 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2002-05-16  Ettore Perazzoli  <ettore@ximian.com>
+
+       * gtk/gtkmenu.c (gtk_menu_paint): If the menu is scrolled down or
+       up, and some of the widget area is empty, don't fill it in with
+       GTK_SHADOW_IN rectangles that make it looks strange.  Fixes
+       #72695.
+
 Wed May 15 18:15:45 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 65f6dd728086b3156b115a363e36d37a3fc43b97..0900f89e97db64ecbface230f37d7d7d6df82ba2 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2002-05-16  Ettore Perazzoli  <ettore@ximian.com>
+
+       * gtk/gtkmenu.c (gtk_menu_paint): If the menu is scrolled down or
+       up, and some of the widget area is empty, don't fill it in with
+       GTK_SHADOW_IN rectangles that make it looks strange.  Fixes
+       #72695.
+
 Wed May 15 18:15:45 2002  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/gtkdnd.c (_gtk_drag_source_handle_event): Don't

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 9d00df94bac7ce0ea351c64a9a38d46bb940b81a..4aa417262aa8b6e27d641536c304edc0f6098f79 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -1680,35 +1680,6 @@ gtk_menu_paint (GtkWidget      *widget,
                           MENU_SCROLL_ARROW_HEIGHT - 2 * border_y - 2);
        }
     }
-  else if (event->window == menu->view_window)
-    {
-      gint menu_height;
-      gint top_pos;
-      
-      if (menu->scroll_offset < 0)
-       gtk_paint_box (widget->style,
-                      menu->view_window,
-                      GTK_STATE_ACTIVE,
-                      GTK_SHADOW_IN,
-                      NULL, widget, "menu",
-                      0, 0,
-                      -1,
-                      -menu->scroll_offset);
-
-      menu_height = widget->requisition.height - 2*border_y;
-      top_pos = height - 2*border_y - (menu->upper_arrow_visible ? MENU_SCROLL_ARROW_HEIGHT : 0);
-
-      if (menu_height - menu->scroll_offset < top_pos)
-       gtk_paint_box (widget->style,
-                      menu->view_window,
-                      GTK_STATE_ACTIVE,
-                      GTK_SHADOW_IN,
-                      NULL, widget, "menu",
-                      0,
-                      menu_height - menu->scroll_offset,
-                      -1,
-                      top_pos - (menu_height - menu->scroll_offset));
-    }
 }
 
 static gboolean