Merge branch 'master' into commands

This commit is contained in:
Ryan Dwyer 2018-08-19 16:07:11 +10:00 committed by GitHub
commit 7f22fab389
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 152 additions and 61 deletions

View file

@ -618,34 +618,16 @@ void view_unmap(struct sway_view *view) {
view->surface = NULL;
}
void view_update_position(struct sway_view *view, double lx, double ly) {
if (view->x == lx && view->y == ly) {
return;
}
container_damage_whole(view->swayc);
view->x = lx;
view->y = ly;
view->swayc->current.view_x = lx;
view->swayc->current.view_y = ly;
if (container_is_floating(view->swayc)) {
container_set_geometry_from_floating_view(view->swayc);
}
container_damage_whole(view->swayc);
}
void view_update_size(struct sway_view *view, int width, int height) {
if (view->width == width && view->height == height) {
if (!sway_assert(container_is_floating(view->swayc),
"Expected a floating container")) {
return;
}
container_damage_whole(view->swayc);
view->width = width;
view->height = height;
view->swayc->current.view_width = width;
view->swayc->current.view_height = height;
if (container_is_floating(view->swayc)) {
container_set_geometry_from_floating_view(view->swayc);
}
container_damage_whole(view->swayc);
container_set_geometry_from_floating_view(view->swayc);
}
static void view_subsurface_create(struct sway_view *view,