alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/willakat/sway

Browse source
This commit is contained in:
wil 2017-01-01 22:02:19 +01:00
parent 97f70987d7 0412e95ba9
commit 704b2db050
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/sway/layout.h
View file

@ -76,4 +76,5 @@ void swayc_log(log_importance_t verbosity, swayc_t *cont, const char* format, ..
enum swayc_layouts default_layout(swayc_t *output); enum swayc_layouts default_layout(swayc_t *output);
bool is_auto_layout(enum swayc_layouts layout); bool is_auto_layout(enum swayc_layouts layout);
#endif #endif

8
sway/layout.c
View file

@ -821,10 +821,6 @@ void update_geometry(swayc_t *container) {
} }
} }
bool is_auto_layout(enum swayc_layouts layout) {
return (layout >= L_AUTO_FIRST) && (layout <= L_AUTO_LAST);
}
/** /**
* Layout application prototypes * Layout application prototypes
*/ */
@ -1503,3 +1499,7 @@ enum swayc_layouts default_layout(swayc_t *output) {
return L_VERT; return L_VERT;
} }
} }
bool is_auto_layout(enum swayc_layouts layout) {
return (layout >= L_AUTO_FIRST) && (layout <= L_AUTO_LAST);
}

9
sway/sway.5.txt
View file

@ -87,11 +87,20 @@ They are expected to be used with **bindsym** or at runtime through **swaymsg**(
_splitv_, _toggle split_, _stacking_, _tabbed_, _auto_left_, _auto_right_, _splitv_, _toggle split_, _stacking_, _tabbed_, _auto_left_, _auto_right_,
_auto_top, _auto_bottom_. _auto_top, _auto_bottom_.
**layout** auto <next|prev>::
Cycles between available auto layouts.
**layout** <incnmaster|incncol> <n>:: **layout** <incnmaster|incncol> <n>::
Modify the number of master elements, respectively slave columns, in the Modify the number of master elements, respectively slave columns, in the
focused container. <n> can be a positive or negative integer. These commands focused container. <n> can be a positive or negative integer. These commands
only have an effect if the focused container uses one of the "auto" layouts. only have an effect if the focused container uses one of the "auto" layouts.
**layout** toggle split::
Cycles between available split layouts.
**layout** promote::
Swap the focused element with the first in the one of the auto layouts.
**move** <left|right|up|down|next|prev|first>:: **move** <left|right|up|down|next|prev|first>::
Moves the focused container _left_, _right_, _up_, or _down_. Moving to _prev_ Moves the focused container _left_, _right_, _up_, or _down_. Moving to _prev_
or _next_ swaps the container with its sibling in the same container. Move or _next_ swaps the container with its sibling in the same container. Move