diff audacious/mainwin.c @ 1063:73be9df33f30 trunk

[svn] - revert back to dock.c, commit 1/2.
author nenolod
date Tue, 16 May 2006 17:05:47 -0700
parents 18ef6f3089d4
children 13d721835794
line wrap: on
line diff
--- a/audacious/mainwin.c	Mon May 15 20:55:19 2006 -0700
+++ b/audacious/mainwin.c	Tue May 16 17:05:47 2006 -0700
@@ -998,9 +998,10 @@
 
     gdk_flush();
 
-    gtk_object_remove_data(GTK_OBJECT(mainwin), "is_moving");
-    gtk_object_remove_data(GTK_OBJECT(mainwin), "offset_x");
-    gtk_object_remove_data(GTK_OBJECT(mainwin), "offset_y");
+    if (mainwin_menurow->mr_doublesize_selected) {
+        event->x /= 2;
+        event->y /= 2;
+    }
 
     handle_release_cb(mainwin_wlist, widget, event);
 
@@ -1036,25 +1037,8 @@
         state = event->state;
     }
 
-    if (gtk_object_get_data(GTK_OBJECT(mainwin), "is_moving"))
-    {
-	gint offset_x, offset_y, mx, my;
-
-	offset_x = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mainwin), "offset_x"));
-	offset_y = GPOINTER_TO_INT(gtk_object_get_data(GTK_OBJECT(mainwin), "offset_y"));
-
-        gdk_window_get_pointer(NULL, &x, &y, NULL);
-
-	mx = x - offset_x;
-	my = y - offset_y;
-
-        gtk_window_move(GTK_WINDOW(mainwin), mx, my);
-    }
-    else
-    {    
-        handle_motion_cb(mainwin_wlist, widget, event);
-        draw_main_window(FALSE);
-    }
+    handle_motion_cb(mainwin_wlist, widget, event);
+    draw_main_window(FALSE);
 
     gdk_flush();
 
@@ -1134,16 +1118,7 @@
             grab = FALSE;
         }
         else
-        {
-	    gint mx, my;
-
-	    gdk_window_get_pointer(GDK_WINDOW(mainwin->window), &mx, &my, NULL);
-	    gtk_object_set_data(GTK_OBJECT(mainwin), "offset_x", GINT_TO_POINTER(mx));
-	    gtk_object_set_data(GTK_OBJECT(mainwin), "offset_y", GINT_TO_POINTER(my));
-
-            gtk_object_set_data(GTK_OBJECT(mainwin), "is_moving", GINT_TO_POINTER(1));
             gtk_window_present(GTK_WINDOW(mainwin));
-        }
     }
     else if (event->button == 1 && event->type == GDK_2BUTTON_PRESS &&
              event->y < 14 && !inside_sensitive_widgets(event->x, event->y)) {