From 01f9d21e9e2c0107223a914917d4cc7edf80044a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 27 Feb 2006 06:44:33 +0000 Subject: [PATCH] slight cleanup --- gtk/gtkdnd.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c index 0040e640ee..7e334c7fe7 100644 --- a/gtk/gtkdnd.c +++ b/gtk/gtkdnd.c @@ -604,9 +604,12 @@ gtk_drag_get_cursor (GdkDisplay *display, info->drag_cursors[i] = NULL; } - hot_x = hot_y = 0; icon_x = info->hot_x; icon_y = info->hot_y; + icon_width = gdk_pixbuf_get_width (info->icon_pixbuf); + icon_height = gdk_pixbuf_get_height (info->icon_pixbuf); + + hot_x = hot_y = 0; cursor_pixbuf = gdk_cursor_get_image (drag_cursors[i].cursor); if (!cursor_pixbuf) cursor_pixbuf = g_object_ref (drag_cursors[i].pixbuf); @@ -694,12 +697,10 @@ gtk_drag_get_cursor (GdkDisplay *display, } #endif } - - icon_width = gdk_pixbuf_get_width (info->icon_pixbuf); - icon_height = gdk_pixbuf_get_height (info->icon_pixbuf); + cursor_width = gdk_pixbuf_get_width (cursor_pixbuf); cursor_height = gdk_pixbuf_get_height (cursor_pixbuf); - + ref_x = MAX (hot_x, icon_x); ref_y = MAX (hot_y, icon_y); width = ref_x + MAX (cursor_width - hot_x, icon_width - icon_x);