koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle floating centering in one function and test for consistency

Browse Source
This commit is contained in:
Deiz
2015-03-30 03:10:40 -04:00
parent 2759a308a2
commit c6581a5fd6
5 changed files with 128 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/floating.c
View File

@ -246,12 +246,10 @@ void floating_enable(Con *con, bool automatic) {
if (con->window && con->window->leader != XCB_NONE &&
(leader = con_by_window_id(con->window->leader)) != NULL) {
DLOG("Centering above leader\n");
nc->rect.x = leader->rect.x + (leader->rect.width / 2) - (nc->rect.width / 2);
nc->rect.y = leader->rect.y + (leader->rect.height / 2) - (nc->rect.height / 2);
floating_center(nc, leader->rect);
} else {
/* center the window on workspace as fallback */
nc->rect.x = ws->rect.x + (ws->rect.width / 2) - (nc->rect.width / 2);
nc->rect.y = ws->rect.y + (ws->rect.height / 2) - (nc->rect.height / 2);
floating_center(nc, ws->rect);
}
}
@ -310,8 +308,7 @@ void floating_enable(Con *con, bool automatic) {
}
ELOG("No output found at destination coordinates, centering floating window on current ws\n");
nc->rect.x = ws->rect.x + (ws->rect.width / 2) - (nc->rect.width / 2);
nc->rect.y = ws->rect.y + (ws->rect.height / 2) - (nc->rect.height / 2);
floating_center(nc, ws->rect);
ipc_send_window_event("floating", con);
}
@ -420,6 +417,15 @@ bool floating_maybe_reassign_ws(Con *con) {
return true;
}
/*
* Centers a floating con above the specified rect.
*
*/
void floating_center(Con *con, Rect rect) {
con->rect.x = rect.x + (rect.width / 2) - (con->rect.width / 2);
con->rect.y = rect.y + (rect.height / 2) - (con->rect.height / 2);
}
DRAGGING_CB(drag_window_callback) {
const struct xcb_button_press_event_t *event = extra;