diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-04-10 07:17:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-10 07:17:47 -0400 |
| commit | 5d3a02a7c624bbef07b1b228eb1bb60fade5248c (patch) | |
| tree | 35860f43beb1ce46de5a3d780ca33830d4bc9ba4 /sway/commands/resize.c | |
| parent | 60ce81e06adc9ea133e8cfd030465e94295a95ff (diff) | |
| parent | 7fee555a462b001748352da1339c9bcc0e154a3b (diff) | |
| download | sway-5d3a02a7c624bbef07b1b228eb1bb60fade5248c.tar.xz | |
Merge branch 'master' into pretty-print-swaymsg
Diffstat (limited to 'sway/commands/resize.c')
| -rw-r--r-- | sway/commands/resize.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sway/commands/resize.c b/sway/commands/resize.c index 61af080c..ef52bb07 100644 --- a/sway/commands/resize.c +++ b/sway/commands/resize.c @@ -19,7 +19,7 @@ enum resize_dim_types { }; static bool set_size_floating(int new_dimension, bool use_width) { - swayc_t *view = get_focused_float(swayc_active_workspace()); + swayc_t *view = current_container; if (view) { if (use_width) { int current_width = view->width; @@ -50,7 +50,7 @@ static bool set_size_floating(int new_dimension, bool use_width) { } static bool resize_floating(int amount, bool use_width) { - swayc_t *view = get_focused_float(swayc_active_workspace()); + swayc_t *view = current_container; if (view) { if (use_width) { @@ -64,7 +64,7 @@ static bool resize_floating(int amount, bool use_width) { } static bool resize_tiled(int amount, bool use_width) { - swayc_t *container = get_focused_view(swayc_active_workspace()); + swayc_t *container = current_container; swayc_t *parent = container->parent; int idx_focused = 0; bool use_major = false; @@ -199,7 +199,7 @@ static bool resize_tiled(int amount, bool use_width) { static bool set_size_tiled(int amount, bool use_width) { int desired; - swayc_t *focused = get_focused_view(swayc_active_workspace()); + swayc_t *focused = current_container; if (use_width) { desired = amount - focused->width; @@ -211,7 +211,7 @@ static bool set_size_tiled(int amount, bool use_width) { } static bool set_size(int dimension, bool use_width) { - swayc_t *focused = get_focused_view_include_floating(swayc_active_workspace()); + swayc_t *focused = current_container; if (focused) { if (focused->is_floating) { @@ -225,7 +225,7 @@ static bool set_size(int dimension, bool use_width) { } static bool resize(int dimension, bool use_width, enum resize_dim_types dim_type) { - swayc_t *focused = get_focused_view_include_floating(swayc_active_workspace()); + swayc_t *focused = current_container; // translate "10 ppt" (10%) to appropriate # of pixels in case we need it float ppt_dim = (float)dimension / 100; |