Use the correct screen for getting the height. (Fix from Stephen Browne,

Fri Dec  6 17:46:42 2002  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkmenu.c (gtk_menu_window_size_request): Use
        the correct screen for getting the height.
        (Fix from Stephen Browne, #96777)
This commit is contained in:
Owen Taylor 2002-12-06 22:49:56 +00:00 committed by Owen Taylor
parent 245a951d4f
commit 17bbbde74a
7 changed files with 38 additions and 1 deletions

View File

@ -1,3 +1,9 @@
Fri Dec 6 17:46:42 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenu.c (gtk_menu_window_size_request): Use
the correct screen for getting the height.
(Fix from Stephen Browne, #96777)
Thu Dec 5 16:01:14 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack

View File

@ -1,3 +1,9 @@
Fri Dec 6 17:46:42 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenu.c (gtk_menu_window_size_request): Use
the correct screen for getting the height.
(Fix from Stephen Browne, #96777)
Thu Dec 5 16:01:14 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack

View File

@ -1,3 +1,9 @@
Fri Dec 6 17:46:42 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenu.c (gtk_menu_window_size_request): Use
the correct screen for getting the height.
(Fix from Stephen Browne, #96777)
Thu Dec 5 16:01:14 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack

View File

@ -1,3 +1,9 @@
Fri Dec 6 17:46:42 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenu.c (gtk_menu_window_size_request): Use
the correct screen for getting the height.
(Fix from Stephen Browne, #96777)
Thu Dec 5 16:01:14 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack

View File

@ -1,3 +1,9 @@
Fri Dec 6 17:46:42 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenu.c (gtk_menu_window_size_request): Use
the correct screen for getting the height.
(Fix from Stephen Browne, #96777)
Thu Dec 5 16:01:14 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack

View File

@ -1,3 +1,9 @@
Fri Dec 6 17:46:42 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenu.c (gtk_menu_window_size_request): Use
the correct screen for getting the height.
(Fix from Stephen Browne, #96777)
Thu Dec 5 16:01:14 2002 Eric Warmenhoven <eric@warmenhoven.org>
* gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack

View File

@ -417,7 +417,8 @@ gtk_menu_window_size_request (GtkWidget *window,
if (private->have_position)
{
gint screen_height = gdk_screen_height ();
GdkScreen *screen = gtk_widget_get_screen (window);
gint screen_height = gdk_screen_get_height (screen);
if (private->y + requisition->height > screen_height)
requisition->height = screen_height - private->y;