diff options
| author | Zandr Martin <zandrmartin@users.noreply.github.com> | 2016-07-04 13:53:49 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-04 13:53:49 -0500 |
| commit | e07b8c8d7cfaaf6667a766c9d42d59fc14e98872 (patch) | |
| tree | 93c374e26425460bfa7ad1bc1528a1b9b5725a8e /include | |
| parent | f8a94f2f4b429c75940d7451d3e7d75dfd4b66d3 (diff) | |
| parent | 33abcd9573155d36f8a40936d06a44704287a99b (diff) | |
| download | sway-e07b8c8d7cfaaf6667a766c9d42d59fc14e98872.tar.xz | |
Merge branch 'master' into get-tree-command
Diffstat (limited to 'include')
| -rw-r--r-- | include/focus.h | 4 | ||||
| -rw-r--r-- | include/resize.h | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/include/focus.h b/include/focus.h index 10d5182b..4abd6080 100644 --- a/include/focus.h +++ b/include/focus.h @@ -21,6 +21,10 @@ swayc_t *get_focused_container(swayc_t *parent); swayc_t *get_focused_view(swayc_t *parent); swayc_t *get_focused_float(swayc_t *ws); +// a special-case function to get the focused view, regardless +// of whether it's tiled or floating +swayc_t *get_focused_view_include_floating(swayc_t *parent); + bool set_focused_container(swayc_t *container); bool set_focused_container_for(swayc_t *ancestor, swayc_t *container); diff --git a/include/resize.h b/include/resize.h index d49cc74a..0d382994 100644 --- a/include/resize.h +++ b/include/resize.h @@ -2,7 +2,13 @@ #define _SWAY_RESIZE_H #include <stdbool.h> -bool set_size_tiled(int amount, bool use_width); -bool resize_tiled(int amount, bool use_width); +enum resize_dim_types { + RESIZE_DIM_PX, + RESIZE_DIM_PPT, + RESIZE_DIM_DEFAULT, +}; + +bool set_size(int dimension, bool use_width); +bool resize(int dimension, bool use_width, enum resize_dim_types dim_type); #endif |