From: Thierry Lorthiois <lorthiois@bbsoft.fr>
Date: Tue, 9 Feb 2010 20:19:49 +0000 (+0000)
Subject: consistency : drag n drop task between desktop will not change active desktop (as... 
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=1aa4f37b38e07a8b08b17cfbcf5259e287d421a3;p=chaz%2Ftint2

consistency : drag n drop task between desktop will not change active desktop (as before)
---

diff --git a/src/tint.c b/src/tint.c
index c8521a0..23970f0 100644
--- a/src/tint.c
+++ b/src/tint.c
@@ -308,7 +308,7 @@ void event_button_motion_notify (XEvent *e)
 	Panel * panel = get_panel(e->xany.window);
 	if(!panel || !task_drag)
 		return;
- 
+
 	// Find the taskbar on the event's location
 	Taskbar * event_taskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y);
 	if(event_taskbar == NULL)
@@ -407,12 +407,6 @@ void event_button_release (XEvent *e)
 		return;
 	}
 
-	// switch desktop
-	if (panel_mode == MULTI_DESKTOP) {
-		if (tskbar->desktop != server.desktop && action != CLOSE && action != DESKTOP_LEFT && action != DESKTOP_RIGHT)
-			set_desktop (tskbar->desktop);
-	}
-
 	// drag and drop task
 	if (task_dragged) {
 		task_drag = 0;
@@ -420,6 +414,12 @@ void event_button_release (XEvent *e)
 		return;
 	}
 
+	// switch desktop
+	if (panel_mode == MULTI_DESKTOP) {
+		if (tskbar->desktop != server.desktop && action != CLOSE && action != DESKTOP_LEFT && action != DESKTOP_RIGHT)
+			set_desktop (tskbar->desktop);
+	}
+
 	// action on task
 	window_action( click_task(panel, e->xbutton.x, e->xbutton.y), action);
 
@@ -789,7 +789,7 @@ int main (int argc, char *argv[])
 						unsigned int button_mask = Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask;
 						if (e.xmotion.state & button_mask)
 							event_button_motion_notify (&e);
-						
+
 						if (!g_tooltip.enabled) break;
 						Panel* panel = get_panel(e.xmotion.window);
 						Area* area = click_area(panel, e.xmotion.x, e.xmotion.y);