mirrors
/
sway
mirror of https://github.com/swaywm/sway.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix movement between outputs

This commit is contained in:
Drew DeVault 2015-08-16 14:47:08 -04:00
parent 5ff71c2d5c
commit 19c0ec6a08
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sway/layout.c
View File

@ -244,6 +244,9 @@ void focus_view(swayc_t *view) {
}
while (view && view->type != C_VIEW) {
view = view->focused;
if (view && view->type == C_OUTPUT) {
wlc_output_focus(view->handle);
}
}
if (view) {
wlc_view_set_state(view->handle, WLC_BIT_ACTIVATED, true);

4
sway/movement.c
View File

@ -28,7 +28,7 @@ bool move_focus(enum movement_direction direction) {
bool can_move = false;
int diff = 0;
if (direction == MOVE_LEFT || direction == MOVE_RIGHT) {
if (parent->layout == L_HORIZ) {
if (parent->layout == L_HORIZ || parent->type == C_ROOT) {
can_move = true;
diff = direction == MOVE_LEFT ? -1 : 1;
}
@ -61,7 +61,7 @@ bool move_focus(enum movement_direction direction) {
sway_log(L_DEBUG, "Can't move at current level, moving up tree");
current = parent;
parent = parent->parent;
if (parent->type == C_ROOT) {
if (!parent) {
// Nothing we can do
return false;
}