brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window: Clean up keyboard-resizing code path

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-07-27 15:03:38 +02:00
parent 938fb8e6c8
commit 0e7221c361
1 changed files with 13 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/core/window.c
View File

@ -5858,45 +5858,23 @@ update_resize (MetaWindow *window,
if (window->display->grab_op == META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN) if (window->display->grab_op == META_GRAB_OP_KEYBOARD_RESIZING_UNKNOWN)
{ {
if ((dx > 0) && (dy > 0)) if ((dx > 0) && (dy > 0))
{ window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_SE;
window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_SE;
meta_window_update_keyboard_resize (window, TRUE);
}
else if ((dx < 0) && (dy > 0)) else if ((dx < 0) && (dy > 0))
{ window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_SW;
window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_SW;
meta_window_update_keyboard_resize (window, TRUE);
}
else if ((dx > 0) && (dy < 0)) else if ((dx > 0) && (dy < 0))
{ window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_NE;
window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_NE;
meta_window_update_keyboard_resize (window, TRUE);
}
else if ((dx < 0) && (dy < 0)) else if ((dx < 0) && (dy < 0))
{ window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_NW;
window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_NW;
meta_window_update_keyboard_resize (window, TRUE);
}
else if (dx < 0) else if (dx < 0)
{ window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_W;
window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_W;
meta_window_update_keyboard_resize (window, TRUE);
}
else if (dx > 0) else if (dx > 0)
{ window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_E;
window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_E;
meta_window_update_keyboard_resize (window, TRUE);
}
else if (dy > 0) else if (dy > 0)
{ window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_S;
window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_S;
meta_window_update_keyboard_resize (window, TRUE);
}
else if (dy < 0) else if (dy < 0)
{ window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_N;
window->display->grab_op = META_GRAB_OP_KEYBOARD_RESIZING_N;
meta_window_update_keyboard_resize (window, TRUE); meta_window_update_keyboard_resize (window, TRUE);
}
} }
new_unmaximize = check_resize_unmaximize (window, dx, dy); new_unmaximize = check_resize_unmaximize (window, dx, dy);
@ -5920,9 +5898,9 @@ update_resize (MetaWindow *window,
case META_GRAB_OP_KEYBOARD_RESIZING_W: case META_GRAB_OP_KEYBOARD_RESIZING_W:
new_w -= dx; new_w -= dx;
break; break;
default: default:
break; break;
} }
switch (window->display->grab_op) switch (window->display->grab_op)
{ {