diff options
Diffstat (limited to 'sway/input/seatop_resize_tiling.c')
-rw-r--r-- | sway/input/seatop_resize_tiling.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sway/input/seatop_resize_tiling.c b/sway/input/seatop_resize_tiling.c index c5fe269e..869d11b5 100644 --- a/sway/input/seatop_resize_tiling.c +++ b/sway/input/seatop_resize_tiling.c | |||
@@ -53,19 +53,19 @@ static void handle_button(struct sway_seat *seat, uint32_t time_msec, | |||
53 | if (e->h_con) { | 53 | if (e->h_con) { |
54 | container_set_resizing(e->h_con, false); | 54 | container_set_resizing(e->h_con, false); |
55 | container_set_resizing(e->h_sib, false); | 55 | container_set_resizing(e->h_sib, false); |
56 | if (e->h_con->parent) { | 56 | if (e->h_con->pending.parent) { |
57 | arrange_container(e->h_con->parent); | 57 | arrange_container(e->h_con->pending.parent); |
58 | } else { | 58 | } else { |
59 | arrange_workspace(e->h_con->workspace); | 59 | arrange_workspace(e->h_con->pending.workspace); |
60 | } | 60 | } |
61 | } | 61 | } |
62 | if (e->v_con) { | 62 | if (e->v_con) { |
63 | container_set_resizing(e->v_con, false); | 63 | container_set_resizing(e->v_con, false); |
64 | container_set_resizing(e->v_sib, false); | 64 | container_set_resizing(e->v_sib, false); |
65 | if (e->v_con->parent) { | 65 | if (e->v_con->pending.parent) { |
66 | arrange_container(e->v_con->parent); | 66 | arrange_container(e->v_con->pending.parent); |
67 | } else { | 67 | } else { |
68 | arrange_workspace(e->v_con->workspace); | 68 | arrange_workspace(e->v_con->pending.workspace); |
69 | } | 69 | } |
70 | } | 70 | } |
71 | transaction_commit_dirty(); | 71 | transaction_commit_dirty(); |
@@ -82,16 +82,16 @@ static void handle_pointer_motion(struct sway_seat *seat, uint32_t time_msec) { | |||
82 | 82 | ||
83 | if (e->h_con) { | 83 | if (e->h_con) { |
84 | if (e->edge & WLR_EDGE_LEFT) { | 84 | if (e->edge & WLR_EDGE_LEFT) { |
85 | amount_x = (e->h_con_orig_width - moved_x) - e->h_con->width; | 85 | amount_x = (e->h_con_orig_width - moved_x) - e->h_con->pending.width; |
86 | } else if (e->edge & WLR_EDGE_RIGHT) { | 86 | } else if (e->edge & WLR_EDGE_RIGHT) { |
87 | amount_x = (e->h_con_orig_width + moved_x) - e->h_con->width; | 87 | amount_x = (e->h_con_orig_width + moved_x) - e->h_con->pending.width; |
88 | } | 88 | } |
89 | } | 89 | } |
90 | if (e->v_con) { | 90 | if (e->v_con) { |
91 | if (e->edge & WLR_EDGE_TOP) { | 91 | if (e->edge & WLR_EDGE_TOP) { |
92 | amount_y = (e->v_con_orig_height - moved_y) - e->v_con->height; | 92 | amount_y = (e->v_con_orig_height - moved_y) - e->v_con->pending.height; |
93 | } else if (e->edge & WLR_EDGE_BOTTOM) { | 93 | } else if (e->edge & WLR_EDGE_BOTTOM) { |
94 | amount_y = (e->v_con_orig_height + moved_y) - e->v_con->height; | 94 | amount_y = (e->v_con_orig_height + moved_y) - e->v_con->pending.height; |
95 | } | 95 | } |
96 | } | 96 | } |
97 | 97 | ||
@@ -143,7 +143,7 @@ void seatop_begin_resize_tiling(struct sway_seat *seat, | |||
143 | if (e->h_con) { | 143 | if (e->h_con) { |
144 | container_set_resizing(e->h_con, true); | 144 | container_set_resizing(e->h_con, true); |
145 | container_set_resizing(e->h_sib, true); | 145 | container_set_resizing(e->h_sib, true); |
146 | e->h_con_orig_width = e->h_con->width; | 146 | e->h_con_orig_width = e->h_con->pending.width; |
147 | } | 147 | } |
148 | } | 148 | } |
149 | if (edge & (WLR_EDGE_TOP | WLR_EDGE_BOTTOM)) { | 149 | if (edge & (WLR_EDGE_TOP | WLR_EDGE_BOTTOM)) { |
@@ -154,7 +154,7 @@ void seatop_begin_resize_tiling(struct sway_seat *seat, | |||
154 | if (e->v_con) { | 154 | if (e->v_con) { |
155 | container_set_resizing(e->v_con, true); | 155 | container_set_resizing(e->v_con, true); |
156 | container_set_resizing(e->v_sib, true); | 156 | container_set_resizing(e->v_sib, true); |
157 | e->v_con_orig_height = e->v_con->height; | 157 | e->v_con_orig_height = e->v_con->pending.height; |
158 | } | 158 | } |
159 | } | 159 | } |
160 | 160 | ||