From c9ce8bf1bd0f4cfb459bcb7d3ec45429c0a81293 Mon Sep 17 00:00:00 2001 From: Luminarys Date: Mon, 17 Aug 2015 10:34:39 -0500 Subject: Style and other minor fixes --- sway/container.c | 4 ++-- sway/handlers.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'sway') diff --git a/sway/container.c b/sway/container.c index 1f93d4dc..231876c5 100644 --- a/sway/container.c +++ b/sway/container.c @@ -170,8 +170,8 @@ swayc_t *new_floating_view(wlc_handle handle) { view->width = geometry->size.w; view->height = geometry->size.h; - view->desired_width = -1; - view->desired_height = -1; + view->desired_width = view->width; + view->desired_height = view->height; view->is_floating = true; diff --git a/sway/handlers.c b/sway/handlers.c index 85df09f7..77e8f237 100644 --- a/sway/handlers.c +++ b/sway/handlers.c @@ -167,16 +167,16 @@ static void handle_view_geometry_request(wlc_handle handle, const struct wlc_geo // This will not do anything for the time being as WLC improperly sends geometry requests swayc_t *view = get_swayc_for_handle(handle, &root_container); if (view) { + view->desired_width = geometry->size.w; + view->desired_height = geometry->size.h; + if (view->is_floating) { - view->width = geometry->size.w; - view->height = geometry->size.h; + view->width = view->desired_width; + view->height = view->desired_height; view->x = geometry->origin.x; view->y = geometry->origin.y; arrange_windows(view->parent, -1, -1); - } else { - view->desired_width = geometry->size.w; - view->desired_height = geometry->size.h; - } + } } } -- cgit v1.2.3