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

Remove duplicate code

Browse source
This commit is contained in:
Ryan Dwyer 2018-10-08 23:50:43 +10:00
parent b8002fc0c4
commit d21d2c8665
4 changed files with 10 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
sway/desktop/xdg_shell.c
View file

@ -401,17 +401,6 @@ static void handle_map(struct wl_listener *listener, void *data) {
view_update_csd_from_client(view, csd); view_update_csd_from_client(view, csd);
} }
if (config->popup_during_fullscreen == POPUP_LEAVE &&
view->container->workspace &&
view->container->workspace->fullscreen &&
view->container->workspace->fullscreen->view &&
xdg_surface->toplevel->parent) {
struct sway_container *fs = view->container->workspace->fullscreen;
if (is_transient_for(view, fs->view)) {
container_set_fullscreen(fs, false);
}
}
if (xdg_surface->toplevel->client_pending.fullscreen) { if (xdg_surface->toplevel->client_pending.fullscreen) {
container_set_fullscreen(view->container, true); container_set_fullscreen(view->container, true);
arrange_workspace(view->container->workspace); arrange_workspace(view->container->workspace);

11
sway/desktop/xdg_shell_v6.c
View file

@ -396,17 +396,6 @@ static void handle_map(struct wl_listener *listener, void *data) {
WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT; WLR_SERVER_DECORATION_MANAGER_MODE_CLIENT;
view_update_csd_from_client(view, csd); view_update_csd_from_client(view, csd);
if (config->popup_during_fullscreen == POPUP_LEAVE &&
view->container->workspace &&
view->container->workspace->fullscreen &&
view->container->workspace->fullscreen->view &&
xdg_surface->toplevel->parent) {
struct sway_container *fs = view->container->workspace->fullscreen;
if (is_transient_for(view, fs->view)) {
container_set_fullscreen(fs, false);
}
}
if (xdg_surface->toplevel->client_pending.fullscreen) { if (xdg_surface->toplevel->client_pending.fullscreen) {
container_set_fullscreen(view->container, true); container_set_fullscreen(view->container, true);
arrange_workspace(view->container->workspace); arrange_workspace(view->container->workspace);

11
sway/desktop/xwayland.c
View file

@ -407,17 +407,6 @@ static void handle_map(struct wl_listener *listener, void *data) {
// Put it back into the tree // Put it back into the tree
view_map(view, xsurface->surface); view_map(view, xsurface->surface);
if (config->popup_during_fullscreen == POPUP_LEAVE &&
view->container->workspace &&
view->container->workspace->fullscreen &&
view->container->workspace->fullscreen->view &&
xsurface->parent) {
struct sway_container *fs = view->container->workspace->fullscreen;
if (is_transient_for(view, fs->view)) {
container_set_fullscreen(fs, false);
}
}
if (xsurface->fullscreen) { if (xsurface->fullscreen) {
container_set_fullscreen(view->container, true); container_set_fullscreen(view->container, true);
arrange_workspace(view->container->workspace); arrange_workspace(view->container->workspace);

10
sway/tree/view.c
View file

@ -575,6 +575,16 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
view_set_tiled(view, true); view_set_tiled(view, true);
} }
if (config->popup_during_fullscreen == POPUP_LEAVE &&
view->container->workspace &&
view->container->workspace->fullscreen &&
view->container->workspace->fullscreen->view) {
struct sway_container *fs = view->container->workspace->fullscreen;
if (view_is_transient_for(view, fs->view)) {
container_set_fullscreen(fs, false);
}
}
if (should_focus(view)) { if (should_focus(view)) {
input_manager_set_focus(input_manager, &view->container->node); input_manager_set_focus(input_manager, &view->container->node);
} }