rootston: fix artifacts when un-maximizing a view
This commit is contained in:
parent
ddafcb86a2
commit
bc001e90e9
|
@ -298,6 +298,10 @@ void view_damage_whole(struct roots_view *view) {
|
|||
}
|
||||
|
||||
void view_update_position(struct roots_view *view, double x, double y) {
|
||||
if (view->x == x && view->y == y) {
|
||||
return;
|
||||
}
|
||||
|
||||
view_damage_whole(view);
|
||||
view->x = x;
|
||||
view->y = y;
|
||||
|
|
|
@ -88,22 +88,23 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) {
|
|||
struct roots_view *view = roots_surface->view;
|
||||
struct wlr_surface *wlr_surface = view->wlr_surface;
|
||||
|
||||
view_apply_damage(view);
|
||||
|
||||
int width = wlr_surface->current->width;
|
||||
int height = wlr_surface->current->height;
|
||||
double x = view->x;
|
||||
double y = view->y;
|
||||
if (view->pending_move_resize.update_x) {
|
||||
double x = view->pending_move_resize.x +
|
||||
view->pending_move_resize.width - width;
|
||||
view_update_position(view, x, view->y);
|
||||
x = view->pending_move_resize.x + view->pending_move_resize.width -
|
||||
width;
|
||||
view->pending_move_resize.update_x = false;
|
||||
}
|
||||
if (view->pending_move_resize.update_y) {
|
||||
double y = view->pending_move_resize.y +
|
||||
view->pending_move_resize.height - height;
|
||||
view_update_position(view, view->x, y);
|
||||
y = view->pending_move_resize.y + view->pending_move_resize.height -
|
||||
height;
|
||||
view->pending_move_resize.update_y = false;
|
||||
}
|
||||
|
||||
view_apply_damage(view);
|
||||
view_update_position(view, x, y);
|
||||
}
|
||||
|
||||
static void handle_destroy(struct wl_listener *listener, void *data) {
|
||||
|
|
|
@ -197,29 +197,30 @@ static void handle_commit(struct wl_listener *listener, void *data) {
|
|||
struct roots_view *view = roots_surface->view;
|
||||
struct wlr_xdg_surface_v6 *surface = view->xdg_surface_v6;
|
||||
|
||||
view_apply_damage(view);
|
||||
|
||||
uint32_t pending_serial =
|
||||
roots_surface->pending_move_resize_configure_serial;
|
||||
if (pending_serial > 0 && pending_serial >= surface->configure_serial) {
|
||||
struct wlr_box size;
|
||||
get_size(view, &size);
|
||||
|
||||
double x = view->x;
|
||||
double y = view->y;
|
||||
if (view->pending_move_resize.update_x) {
|
||||
double x = view->pending_move_resize.x +
|
||||
view->pending_move_resize.width - size.width;
|
||||
view_update_position(view, x, view->y);
|
||||
x = view->pending_move_resize.x + view->pending_move_resize.width -
|
||||
size.width;
|
||||
}
|
||||
if (view->pending_move_resize.update_y) {
|
||||
double y = view->pending_move_resize.y +
|
||||
view->pending_move_resize.height - size.height;
|
||||
view_update_position(view, view->x, y);
|
||||
y = view->pending_move_resize.y + view->pending_move_resize.height -
|
||||
size.height;
|
||||
}
|
||||
view_update_position(view, x, y);
|
||||
|
||||
if (pending_serial == surface->configure_serial) {
|
||||
roots_surface->pending_move_resize_configure_serial = 0;
|
||||
}
|
||||
}
|
||||
|
||||
view_apply_damage(view);
|
||||
}
|
||||
|
||||
static void handle_destroy(struct wl_listener *listener, void *data) {
|
||||
|
|
|
@ -204,23 +204,23 @@ static void handle_surface_commit(struct wl_listener *listener, void *data) {
|
|||
struct roots_view *view = roots_surface->view;
|
||||
struct wlr_surface *wlr_surface = view->wlr_surface;
|
||||
|
||||
view_apply_damage(view);
|
||||
|
||||
int width = wlr_surface->current->width;
|
||||
int height = wlr_surface->current->height;
|
||||
|
||||
double x = view->x;
|
||||
double y = view->y;
|
||||
if (view->pending_move_resize.update_x) {
|
||||
double x = view->pending_move_resize.x +
|
||||
view->pending_move_resize.width - width;
|
||||
view_update_position(view, x, view->y);
|
||||
x = view->pending_move_resize.x + view->pending_move_resize.width -
|
||||
width;
|
||||
view->pending_move_resize.update_x = false;
|
||||
}
|
||||
if (view->pending_move_resize.update_y) {
|
||||
double y = view->pending_move_resize.y +
|
||||
view->pending_move_resize.height - height;
|
||||
view_update_position(view, view->x, y);
|
||||
y = view->pending_move_resize.y + view->pending_move_resize.height -
|
||||
height;
|
||||
view->pending_move_resize.update_y = false;
|
||||
}
|
||||
|
||||
view_apply_damage(view);
|
||||
view_update_position(view, x, y);
|
||||
}
|
||||
|
||||
static void handle_map_notify(struct wl_listener *listener, void *data) {
|
||||
|
|
Loading…
Reference in New Issue