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

Use surface size if xdg shell's geometry isn't set

This commit is contained in:
Ryan Dwyer 2018-05-26 20:37:04 +10:00
parent 4371c746e4
commit 3b1db30a5e
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sway/desktop/xdg_shell.c
View File

@ -182,13 +182,18 @@ static void handle_commit(struct wl_listener *listener, void *data) {
struct sway_xdg_shell_view *xdg_shell_view =
wl_container_of(listener, xdg_shell_view, commit);
struct sway_view *view = &xdg_shell_view->view;
struct wlr_box *geometry = &view->wlr_xdg_surface->geometry;
int width = view->wlr_xdg_surface->geometry.width;
int height = view->wlr_xdg_surface->geometry.height;
if (!width && !height) {
width = view->wlr_xdg_surface->surface->current->width;
height = view->wlr_xdg_surface->surface->current->height;
}
if (!view->natural_width && !view->natural_height) {
view->natural_width = geometry->width;
view->natural_height = geometry->height;
view->natural_width = width;
view->natural_height = height;
}
if (view->swayc && container_is_floating(view->swayc)) {
view_update_size(view, geometry->width, geometry->height);
view_update_size(view, width, height);
} else {
view_update_size(view, xdg_shell_view->pending_width,
xdg_shell_view->pending_height);

13
sway/desktop/xdg_shell_v6.c
View File

@ -181,13 +181,18 @@ static void handle_commit(struct wl_listener *listener, void *data) {
struct sway_xdg_shell_v6_view *xdg_shell_v6_view =
wl_container_of(listener, xdg_shell_v6_view, commit);
struct sway_view *view = &xdg_shell_v6_view->view;
struct wlr_box *geometry = &view->wlr_xdg_surface_v6->geometry;
int width = view->wlr_xdg_surface_v6->geometry.width;
int height = view->wlr_xdg_surface_v6->geometry.height;
if (!width && !height) {
width = view->wlr_xdg_surface_v6->surface->current->width;
height = view->wlr_xdg_surface_v6->surface->current->height;
}
if (!view->natural_width && !view->natural_height) {
view->natural_width = geometry->width;
view->natural_height = geometry->height;
view->natural_width = width;
view->natural_height = height;
}
if (view->swayc && container_is_floating(view->swayc)) {
view_update_size(view, geometry->width, geometry->height);
view_update_size(view, width, height);
} else {
view_update_size(view, xdg_shell_v6_view->pending_width,
xdg_shell_v6_view->pending_height);