/* TODO: calculate x, y with transfrom object */
if ((e_client_util_resizing_get(ec)) && (!ec->transformed) && (e_comp_wl->resize.edges))
{
- int x, y;
+ int w, h;
- x = ec->mouse.last_down[ec->moveinfo.down.button - 1].w;
- y = ec->mouse.last_down[ec->moveinfo.down.button - 1].h;
+ w = ec->mouse.last_down[ec->moveinfo.down.button - 1].w;
+ h = ec->mouse.last_down[ec->moveinfo.down.button - 1].h;
if (e_comp_object_frame_exists(ec->frame))
- e_comp_object_frame_wh_unadjust(ec->frame, x, y, &x, &y);
+ e_comp_object_frame_wh_unadjust(ec->frame, w, h, &w, &h);
switch (ec->resize_mode)
{
case E_POINTER_RESIZE_TL:
case E_POINTER_RESIZE_L:
case E_POINTER_RESIZE_BL:
- x += ec->mouse.last_down[ec->moveinfo.down.button - 1].mx -
+ w += ec->mouse.last_down[ec->moveinfo.down.button - 1].mx -
ec->mouse.current.mx;
break;
case E_POINTER_RESIZE_TR:
case E_POINTER_RESIZE_R:
case E_POINTER_RESIZE_BR:
- x += ec->mouse.current.mx - ec->mouse.last_down[ec->moveinfo.down.button - 1].mx;
+ w += ec->mouse.current.mx - ec->mouse.last_down[ec->moveinfo.down.button - 1].mx;
break;
default:
break;;
case E_POINTER_RESIZE_TL:
case E_POINTER_RESIZE_T:
case E_POINTER_RESIZE_TR:
- y += ec->mouse.last_down[ec->moveinfo.down.button - 1].my -
+ h += ec->mouse.last_down[ec->moveinfo.down.button - 1].my -
ec->mouse.current.my;
break;
case E_POINTER_RESIZE_BL:
case E_POINTER_RESIZE_B:
case E_POINTER_RESIZE_BR:
- y += ec->mouse.current.my - ec->mouse.last_down[ec->moveinfo.down.button - 1].my;
+ h += ec->mouse.current.my - ec->mouse.last_down[ec->moveinfo.down.button - 1].my;
break;
default:
break;
}
- x = E_CLAMP(x, 1, x);
- y = E_CLAMP(y, 1, y);
- e_client_resize_limit(ec, &x, &y);
+ w = E_CLAMP(w, 1, w);
+ h = E_CLAMP(h, 1, h);
+ e_client_resize_limit(ec, &w, &h);
ec->comp_data->shell.configure_send(ec->comp_data->shell.surface,
e_comp_wl->resize.edges,
- x, y);
+ w, h);
}
else if ((!ec->fullscreen) && (!ec->maximized) &&
(!ec->comp_data->maximize_pre))