Mabox/tint2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://tint2.googlecode.com/svn/trunk@394 121b4492-b84c-0410-8b4c-0d4edfb3f3cc
This commit is contained in:
thilor77
2010-02-09 20:19:49 +00:00
parent bf1dc33ca7
commit 2126b2e47d
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tint.c
View File

@@ -308,7 +308,7 @@ void event_button_motion_notify (XEvent *e)
Panel * panel = get_panel(e->xany.window); Panel * panel = get_panel(e->xany.window);
if(!panel || !task_drag) if(!panel || !task_drag)
return; return;
// Find the taskbar on the event's location // Find the taskbar on the event's location
Taskbar * event_taskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y); Taskbar * event_taskbar = click_taskbar(panel, e->xbutton.x, e->xbutton.y);
if(event_taskbar == NULL) if(event_taskbar == NULL)
@@ -407,12 +407,6 @@ void event_button_release (XEvent *e)
return; 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 // drag and drop task
if (task_dragged) { if (task_dragged) {
task_drag = 0; task_drag = 0;
@@ -420,6 +414,12 @@ void event_button_release (XEvent *e)
return; 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 // action on task
window_action( click_task(panel, e->xbutton.x, e->xbutton.y), action); 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; unsigned int button_mask = Button1Mask | Button2Mask | Button3Mask | Button4Mask | Button5Mask;
if (e.xmotion.state & button_mask) if (e.xmotion.state & button_mask)
event_button_motion_notify (&e); event_button_motion_notify (&e);
if (!g_tooltip.enabled) break; if (!g_tooltip.enabled) break;
Panel* panel = get_panel(e.xmotion.window); Panel* panel = get_panel(e.xmotion.window);
Area* area = click_area(panel, e.xmotion.x, e.xmotion.y); Area* area = click_area(panel, e.xmotion.x, e.xmotion.y);