callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some places that weren't properly Xinerama-ified.

Browse Source 
Wed Aug 13 16:32:43 2003  Owen Taylor  <otaylor@redhat.com>

        * gtk/gtkmenu.c (gtk_menu_position, gtk_menu_window_size_request):
        Fix some places that weren't properly Xinerama-ified.

        * gtk/gtkmenu.c: Fix problem with windows that scroll
        at the top of the screen.
This commit is contained in:
Owen Taylor 2003-08-13 20:45:37 +00:00 committed by Owen Taylor
parent 4001482cb5
commit 91d3768017
6 changed files with 63 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Wed Aug 13 16:32:43 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenu.c (gtk_menu_position, gtk_menu_window_size_request):
Fix some places that weren't properly Xinerama-ified.
* gtk/gtkmenu.c: Fix problem with windows that scroll
at the top of the screen.
Wed Aug 13 11:34:53 2003 Owen Taylor <otaylor@redhat.com> Wed Aug 13 11:34:53 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcombo.c (gtk_combo_init): connect_after() to * gtk/gtkcombo.c (gtk_combo_init): connect_after() to

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
Wed Aug 13 16:32:43 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenu.c (gtk_menu_position, gtk_menu_window_size_request):
Fix some places that weren't properly Xinerama-ified.
* gtk/gtkmenu.c: Fix problem with windows that scroll
at the top of the screen.
Wed Aug 13 11:34:53 2003 Owen Taylor <otaylor@redhat.com> Wed Aug 13 11:34:53 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcombo.c (gtk_combo_init): connect_after() to * gtk/gtkcombo.c (gtk_combo_init): connect_after() to

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
Wed Aug 13 16:32:43 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenu.c (gtk_menu_position, gtk_menu_window_size_request):
Fix some places that weren't properly Xinerama-ified.
* gtk/gtkmenu.c: Fix problem with windows that scroll
at the top of the screen.
Wed Aug 13 11:34:53 2003 Owen Taylor <otaylor@redhat.com> Wed Aug 13 11:34:53 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcombo.c (gtk_combo_init): connect_after() to * gtk/gtkcombo.c (gtk_combo_init): connect_after() to

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
Wed Aug 13 16:32:43 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenu.c (gtk_menu_position, gtk_menu_window_size_request):
Fix some places that weren't properly Xinerama-ified.
* gtk/gtkmenu.c: Fix problem with windows that scroll
at the top of the screen.
Wed Aug 13 11:34:53 2003 Owen Taylor <otaylor@redhat.com> Wed Aug 13 11:34:53 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcombo.c (gtk_combo_init): connect_after() to * gtk/gtkcombo.c (gtk_combo_init): connect_after() to

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
Wed Aug 13 16:32:43 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkmenu.c (gtk_menu_position, gtk_menu_window_size_request):
Fix some places that weren't properly Xinerama-ified.
* gtk/gtkmenu.c: Fix problem with windows that scroll
at the top of the screen.
Wed Aug 13 11:34:53 2003 Owen Taylor <otaylor@redhat.com> Wed Aug 13 11:34:53 2003 Owen Taylor <otaylor@redhat.com>
* gtk/gtkcombo.c (gtk_combo_init): connect_after() to * gtk/gtkcombo.c (gtk_combo_init): connect_after() to

39
gtk/gtkmenu.c
View File

@ -505,10 +505,18 @@ gtk_menu_window_size_request (GtkWidget *window,
if (private->have_position) if (private->have_position)
{ {
GdkScreen *screen = gtk_widget_get_screen (window); GdkScreen *screen = gtk_widget_get_screen (window);
gint screen_height = gdk_screen_get_height (screen); GdkRectangle monitor;
gint monitor_num;
monitor_num = gdk_screen_get_monitor_at_point (screen,
private->x, private->y);
gdk_screen_get_monitor_geometry (screen, monitor_num, &monitor);
if (private->y + requisition->height > screen_height) if (private->y + requisition->height > monitor.y + monitor.height)
requisition->height = screen_height - private->y; requisition->height = monitor.y + monitor.height - private->y;
if (private->y < monitor.y)
requisition->height -= monitor.y - private->y;
} }
} }
@ -2878,7 +2886,7 @@ gtk_menu_position (GtkMenu *menu)
if (y < monitor.y) if (y < monitor.y)
{ {
scroll_offset -= y; scroll_offset += monitor.y - y;
y = monitor.y; y = monitor.y;
} }
} }
@ -2886,13 +2894,21 @@ gtk_menu_position (GtkMenu *menu)
/* FIXME: should this be done in the various position_funcs ? */ /* FIXME: should this be done in the various position_funcs ? */
x = CLAMP (x, monitor.x, MAX (monitor.x, monitor.x + monitor.width - requisition.width)); x = CLAMP (x, monitor.x, MAX (monitor.x, monitor.x + monitor.width - requisition.width));
if (GTK_MENU_SHELL (menu)->active)
{
private = gtk_menu_get_private (menu);
private->have_position = TRUE;
private->x = x;
private->y = y;
}
if (y + requisition.height > monitor.y + monitor.height) if (y + requisition.height > monitor.y + monitor.height)
requisition.height = (monitor.y + monitor.height) - y; requisition.height = (monitor.y + monitor.height) - y;
if (y < monitor.y) if (y < monitor.y)
{ {
scroll_offset -= y; scroll_offset += monitor.y - y;
requisition.height -= -y; requisition.height -= monitor.y - y;
y = monitor.y; y = monitor.y;
} }
@ -2902,16 +2918,7 @@ gtk_menu_position (GtkMenu *menu)
gtk_window_move (GTK_WINDOW (GTK_MENU_SHELL (menu)->active ? menu->toplevel : menu->tearoff_window), gtk_window_move (GTK_WINDOW (GTK_MENU_SHELL (menu)->active ? menu->toplevel : menu->tearoff_window),
x, y); x, y);
if (GTK_MENU_SHELL (menu)->active) if (!GTK_MENU_SHELL (menu)->active)
{
private = gtk_menu_get_private (menu);
private->have_position = TRUE;
private->x = x;
private->y = y;
gtk_widget_queue_resize (menu->toplevel);
}
else
{ {
gtk_window_resize (GTK_WINDOW (menu->tearoff_window), gtk_window_resize (GTK_WINDOW (menu->tearoff_window),
requisition.width, requisition.height); requisition.width, requisition.height);