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

app: place the gimpview-popup at the button event's root coordinates

Browse Source 
instead of fiddling with the widget's and its window's positions.
This commit is contained in:
Michael Natterer
2011-03-01 14:53:54 +01:00
parent f82daa557a
commit f45e171f09
1 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/widgets/gimpview-popup.c
View File

@ -108,18 +108,8 @@ gimp_view_popup_show (GtkWidget *widget,
popup->popup_height = popup_height; popup->popup_height = popup_height;
popup->dot_for_dot = dot_for_dot; popup->dot_for_dot = dot_for_dot;
popup->button = bevent->button; popup->button = bevent->button;
popup->button_x = bevent->x; popup->button_x = bevent->x_root;
popup->button_y = bevent->y; popup->button_y = bevent->y_root;
if (! gtk_widget_get_has_window (widget))
{
GtkAllocation allocation;
gtk_widget_get_allocation (widget, &allocation);
popup->button_x += allocation.x;
popup->button_y += allocation.y;
}
g_signal_connect (widget, "button-release-event", g_signal_connect (widget, "button-release-event",
G_CALLBACK (gimp_view_popup_button_release), G_CALLBACK (gimp_view_popup_button_release),
@ -232,10 +222,8 @@ gimp_view_popup_timeout (GimpViewPopup *popup)
gtk_container_add (GTK_CONTAINER (frame), view); gtk_container_add (GTK_CONTAINER (frame), view);
gtk_widget_show (view); gtk_widget_show (view);
gdk_window_get_origin (gtk_widget_get_window (popup->widget), &x, &y); x = popup->button_x - (popup->popup_width / 2);
y = popup->button_y - (popup->popup_height / 2);
x += popup->button_x - (popup->popup_width >> 1);
y += popup->button_y - (popup->popup_height >> 1);
monitor = gdk_screen_get_monitor_at_point (screen, x, y); monitor = gdk_screen_get_monitor_at_point (screen, x, y);
gdk_screen_get_monitor_geometry (screen, monitor, &rect); gdk_screen_get_monitor_geometry (screen, monitor, &rect);