diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-12-06 22:49:56 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-12-06 22:49:56 +0000 |
| commit | 17bbbde74ae114c629f6ce573a667e60c613bb3e (patch) | |
| tree | 5577a1e1938d9e81c91efc96ff395695d1c1df5d | |
| parent | 245a951d4f96c48146d1f0512bc108f8cfcea615 (diff) | |
| download | gdk-pixbuf-17bbbde74ae114c629f6ce573a667e60c613bb3e.tar.gz | |
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)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtkmenu.c | 3 |
7 files changed, 38 insertions, 1 deletions
@@ -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 diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9bd6cef54..9196946b0 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -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 diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9bd6cef54..9196946b0 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -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 diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9bd6cef54..9196946b0 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -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 diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9bd6cef54..9196946b0 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -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 diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9bd6cef54..9196946b0 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -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 diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c index d7c06650c..ee2f8a0e1 100644 --- a/gtk/gtkmenu.c +++ b/gtk/gtkmenu.c @@ -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; |