mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-16 06:59:49 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement tiling drag

Browse source 
Hold floating_modifier and drag a tiling view to a new location.
This commit is contained in:
Ryan Dwyer 2018-09-11 21:34:21 +10:00
parent ec9c4de564
commit 8bb40c24c7
10 changed files with 274 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
sway/tree/container.c
View file

@ -835,8 +835,14 @@ void container_end_mouse_operation(struct sway_container *container) {
struct sway_seat *seat;
wl_list_for_each(seat, &input_manager->seats, link) {
if (seat->op_container == container) {
seat->op_target_node = NULL; // ensure tiling move doesn't apply
seat_end_mouse_operation(seat);
}
// If the user is doing a tiling drag over this container,
// keep the operation active but unset the target container.
if (seat->op_target_node == &container->node) {
seat->op_target_node = NULL;
}
}
}
@ -1086,13 +1092,13 @@ void container_insert_child(struct sway_container *parent,
}
void container_add_sibling(struct sway_container *fixed,
struct sway_container *active) {
struct sway_container *active, int side) {
if (active->workspace) {
container_detach(active);
}
list_t *siblings = container_get_siblings(fixed);
int index = list_find(siblings, fixed);
list_insert(siblings, index + 1, active);
list_insert(siblings, index + side, active);
active->parent = fixed->parent;
active->workspace = fixed->workspace;
container_for_each_child(active, set_workspace, NULL);
@ -1145,7 +1151,7 @@ void container_detach(struct sway_container *child) {
void container_replace(struct sway_container *container,
struct sway_container *replacement) {
container_add_sibling(container, replacement);
container_add_sibling(container, replacement, 1);
container_detach(container);
}

2
sway/tree/view.c
View file

@ -529,7 +529,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
view->container = container_create(view);
if (target_sibling) {
container_add_sibling(target_sibling, view->container);
container_add_sibling(target_sibling, view->container, 1);
} else {
workspace_add_tiling(ws, view->container);
}

13
sway/tree/workspace.c
View file

@ -694,3 +694,16 @@ void workspace_get_box(struct sway_workspace *workspace, struct wlr_box *box) {
box->width = workspace->width;
box->height = workspace->height;
}
static void count_tiling_views(struct sway_container *con, void *data) {
if (con->view && !container_is_floating_or_child(con)) {
size_t *count = data;
*count += 1;
}
}
size_t workspace_num_tiling_views(struct sway_workspace *ws) {
size_t count = 0;
workspace_for_each_container(ws, count_tiling_views, &count);
return count;
}