From c61105d1e2de85b737621612615a8485df569f44 Mon Sep 17 00:00:00 2001 From: taiyu Date: Thu, 20 Aug 2015 18:49:13 -0700 Subject: [PATCH] does this fix it now --- sway/focus.c | 2 +- sway/handlers.c | 2 +- sway/layout.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sway/focus.c b/sway/focus.c index be1476025..76e76a42b 100644 --- a/sway/focus.c +++ b/sway/focus.c @@ -88,7 +88,7 @@ void set_focused_container(swayc_t *c) { // if that focsued container is fullscreen dont change focus swayc_t *workspace = swayc_parent_by_type(c, C_WORKSPACE); swayc_t *focused = get_focused_view(workspace); - if (swayc_is_fullscreen(focused)) { + if (active_workspace == workspace && swayc_is_fullscreen(focused)) { return; } diff --git a/sway/handlers.c b/sway/handlers.c index 6c4c195ba..7ba55cba6 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -513,7 +513,6 @@ static void handle_wlc_ready(void) { config->active = true; } - struct wlc_interface interface = { .output = { .created = handle_output_created, @@ -541,3 +540,4 @@ struct wlc_interface interface = { .ready = handle_wlc_ready } }; + diff --git a/sway/layout.c b/sway/layout.c index e33c007cb..f76ccd1df 100644 --- a/sway/layout.c +++ b/sway/layout.c @@ -15,7 +15,7 @@ void init_layout(void) { root_container.type = C_ROOT; root_container.layout = L_NONE; root_container.children = create_list(); - root_container.handle = -1; + root_container.handle = 0; } // Children of container functions