1 files changed, 24 insertions, 14 deletions

diff --git a/sway/tree/container.c b/sway/tree/container.c
index 47687744..788300cc 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -67,12 +67,10 @@ void container_destroy(struct sway_container *con) {
         list_free(con->outputs);
 
         if (con->view) {
-                struct sway_view *view = con->view;
-                view->container = NULL;
-                free(view->title_format);
-                view->title_format = NULL;
-
-                if (view->destroying) {
+                if (con->view->container == con) {
+                        con->view->container = NULL;
+                }
+                if (con->view->destroying) {
                         view_destroy(con->view);
                 }
         }
@@ -215,8 +213,7 @@ static struct sway_container *container_at_tabbed(struct sway_node *parent,
                         child_index = children->length - 1;
                 }
                 struct sway_container *child = children->items[child_index];
-                struct sway_node *node = seat_get_focus_inactive(seat, &child->node);
-                return node->sway_container;
+                return child;
         }
 
         // Surfaces
@@ -243,8 +240,7 @@ static struct sway_container *container_at_stacked(struct sway_node *parent,
         int child_index = (ly - box.y) / title_height;
         if (child_index < children->length) {
                 struct sway_container *child = children->items[child_index];
-                struct sway_node *node = seat_get_focus_inactive(seat, &child->node);
-                return node->sway_container;
+                return child;
         }
 
         // Surfaces
@@ -465,11 +461,17 @@ static void update_title_texture(struct sway_container *con,
         cairo_surface_t *surface = cairo_image_surface_create(
                         CAIRO_FORMAT_ARGB32, width, height);
         cairo_t *cairo = cairo_create(surface);
+        cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST);
+        cairo_font_options_t *fo = cairo_font_options_create();
+        cairo_font_options_set_hint_style(fo, CAIRO_HINT_STYLE_FULL);
+        cairo_font_options_set_antialias(fo, CAIRO_ANTIALIAS_SUBPIXEL);
+        cairo_font_options_set_subpixel_order(fo, to_cairo_subpixel_order(output->wlr_output->subpixel));
+        cairo_set_font_options(cairo, fo);
+        cairo_font_options_destroy(fo);
         cairo_set_source_rgba(cairo, class->background[0], class->background[1],
                         class->background[2], class->background[3]);
         cairo_paint(cairo);
         PangoContext *pango = pango_cairo_create_context(cairo);
-        cairo_set_antialias(cairo, CAIRO_ANTIALIAS_BEST);
         cairo_set_source_rgba(cairo, class->text[0], class->text[1],
                         class->text[2], class->text[3]);
         cairo_move_to(cairo, 0, 0);
@@ -591,7 +593,7 @@ void container_update_representation(struct sway_container *con) {
         }
 }
 
-size_t container_titlebar_height() {
+size_t container_titlebar_height(void) {
         return config->font_height + TITLEBAR_V_PADDING * 2;
 }
 
@@ -821,9 +823,16 @@ void container_floating_move_to_center(struct sway_container *con) {
                 return;
         }
         struct sway_workspace *ws = con->workspace;
+        bool full = con->is_fullscreen;
+        if (full) {
+                container_set_fullscreen(con, false);
+        }
         double new_lx = ws->x + (ws->width - con->width) / 2;
         double new_ly = ws->y + (ws->height - con->height) / 2;
         container_floating_translate(con, new_lx - con->x, new_ly - con->y);
+        if (full) {
+                container_set_fullscreen(con, true);
+        }
 }
 
 static bool find_urgent_iterator(struct sway_container *con, void *data) {
@@ -981,7 +990,8 @@ void container_discover_outputs(struct sway_container *con) {
                 }
         }
         struct sway_output *new_output = container_get_effective_output(con);
-        double old_scale = old_output ? old_output->wlr_output->scale : -1;
+        double old_scale = old_output && old_output->enabled ?
+                old_output->wlr_output->scale : -1;
         double new_scale = new_output ? new_output->wlr_output->scale : -1;
         if (old_scale != new_scale) {
                 container_update_title_textures(con);
@@ -1019,7 +1029,7 @@ void container_add_gaps(struct sway_container *c) {
 
         struct sway_workspace *ws = c->workspace;
 
-        c->current_gaps = ws->has_gaps ? ws->gaps_inner : config->gaps_inner;
+        c->current_gaps = ws->gaps_inner;
         c->x += c->current_gaps;
         c->y += c->current_gaps;
         c->width -= 2 * c->current_gaps;