consistency : drag n drop task between desktop will not change active desktop (as before) git-svn-id: http://tint2.googlecode.com/svn/trunk@394 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
1 files changed,
8 insertions(+),
8 deletions(-)
jump to
M
src/tint.c
→
src/tint.c
@@ -308,7 +308,7 @@ {
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,17 +407,17 @@ task_drag = 0;
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; task_dragged = 0; 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@@ -789,7 +789,7 @@ case MotionNotify: {
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);