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

app: pushed the wrong version of the last commit

Browse Source
This commit is contained in:
Michael Natterer
2014-05-03 21:46:19 +02:00
parent bb3ab4c506
commit ff74c76aac
1 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/widgets/gimpwidgets-utils.c
View File

@ -1340,38 +1340,32 @@ gimp_session_write_position (GimpConfigWriter *writer,
gint
gimp_widget_get_monitor (GtkWidget *widget)
{
GdkWindow *window;
GdkScreen *screen;
gint x, y;
GdkWindow *window;
GdkScreen *screen;
GtkAllocation allocation;
gint x, y;
g_return_val_if_fail (GTK_IS_WIDGET (widget), 0);
window = gtk_widget_get_window (widget);
if (! window)
return gimp_get_monitor_at_pointer (&screen);
screen = gtk_widget_get_screen (widget);
if (window)
gdk_window_get_origin (window, &x, &y);
gtk_widget_get_allocation (widget, &allocation);
if (! gtk_widget_get_has_window (widget))
{
GtkAllocation allocation;
gtk_widget_get_allocation (widget, &allocation);
gdk_window_get_origin (window, &x, &y);
if (! gtk_widget_get_has_window (widget))
{
x += allocation.x;
y += allocation.y;
}
x += allocation.x + allocation.width / 2;
y += allocation.y + allocation.height / 2;
}
else
{
gdk_display_get_pointer (gtk_widget_get_display (widget),
NULL, &x, &y, NULL);
x += allocation.x;
y += allocation.y;
}
x += allocation.width / 2;
y += allocation.height / 2;
return gdk_screen_get_monitor_at_point (screen, x, y);
}