alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix mpv damage issue when unfullscreening into floating

Browse source
This commit is contained in:
Ryan Dwyer 2018-05-31 18:21:49 +10:00
parent c9e3a313b4
commit a2c1cb9072
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/sway/tree/view.h
View file

@ -51,6 +51,9 @@ struct sway_view {
double x, y; double x, y;
int width, height; int width, height;
double saved_x, saved_y;
int saved_width, saved_height;
// The size the view would want to be if it weren't tiled. // The size the view would want to be if it weren't tiled.
// Used when changing a view from tiled to floating. // Used when changing a view from tiled to floating.
int natural_width, natural_height; int natural_width, natural_height;

11
sway/tree/view.c
View file

@ -274,6 +274,10 @@ void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) {
view_set_fullscreen(workspace->sway_workspace->fullscreen, false); view_set_fullscreen(workspace->sway_workspace->fullscreen, false);
} }
workspace->sway_workspace->fullscreen = view; workspace->sway_workspace->fullscreen = view;
view->saved_x = view->x;
view->saved_y = view->y;
view->saved_width = view->width;
view->saved_height = view->height;
view->swayc->saved_x = view->swayc->x; view->swayc->saved_x = view->swayc->x;
view->swayc->saved_y = view->swayc->y; view->swayc->saved_y = view->swayc->y;
view->swayc->saved_width = view->swayc->width; view->swayc->saved_width = view->swayc->width;
@ -296,11 +300,12 @@ void view_set_fullscreen_raw(struct sway_view *view, bool fullscreen) {
} }
} else { } else {
workspace->sway_workspace->fullscreen = NULL; workspace->sway_workspace->fullscreen = NULL;
if (container_is_floating(view->swayc)) {
view_configure(view, view->saved_x, view->saved_y,
view->saved_width, view->saved_height);
} else {
view->swayc->width = view->swayc->saved_width; view->swayc->width = view->swayc->saved_width;
view->swayc->height = view->swayc->saved_height; view->swayc->height = view->swayc->saved_height;
if (container_is_floating(view->swayc)) {
view->swayc->x = view->swayc->saved_x;
view->swayc->y = view->swayc->saved_y;
view_autoconfigure(view); view_autoconfigure(view);
} }
} }