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

minor fixes

Browse source
This commit is contained in:
Erik Reider 2023-03-21 15:56:15 +01:00
parent 68c78370f3
commit 4d584e1da2
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
sway/tree/root.c
View file

@ -55,6 +55,17 @@ void root_destroy(struct sway_root *root) {
free(root); free(root);
} }
/* Set minimized state from scratchpad container `show` state */
static void root_scratchpad_set_minimize(struct sway_container *con, bool minimize) {
struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel = con->view->foreign_toplevel;
struct wlr_xwayland_surface *xsurface = con->view->wlr_xwayland_surface;
if (xsurface) {
wlr_xwayland_surface_set_minimized(xsurface, minimize);
} else if (foreign_toplevel) {
wlr_foreign_toplevel_handle_v1_set_minimized(foreign_toplevel, minimize);
}
}
void root_scratchpad_add_container(struct sway_container *con, struct sway_workspace *ws) { void root_scratchpad_add_container(struct sway_container *con, struct sway_workspace *ws) {
if (!sway_assert(!con->scratchpad, "Container is already in scratchpad")) { if (!sway_assert(!con->scratchpad, "Container is already in scratchpad")) {
return; return;
@ -96,6 +107,9 @@ void root_scratchpad_add_container(struct sway_container *con, struct sway_works
seat_set_focus(seat, new_focus); seat_set_focus(seat, new_focus);
} }
// Set minimize state to minimized
root_scratchpad_set_minimize(con, true);
ipc_event_window(con, "move"); ipc_event_window(con, "move");
} }
@ -111,17 +125,6 @@ void root_scratchpad_remove_container(struct sway_container *con) {
} }
} }
/* Set minimized state from scratchpad container `show` state */
static void root_handle_container(struct sway_container *con, bool show) {
struct wlr_foreign_toplevel_handle_v1 *foreign_toplevel = con->view->foreign_toplevel;
struct wlr_xwayland_surface *xsurface = con->view->wlr_xwayland_surface;
if (xsurface) {
wlr_xwayland_surface_set_minimized(xsurface, !show);
} else if (foreign_toplevel) {
wlr_foreign_toplevel_handle_v1_set_minimized(foreign_toplevel, !show);
}
}
void root_scratchpad_show(struct sway_container *con) { void root_scratchpad_show(struct sway_container *con) {
struct sway_seat *seat = input_manager_current_seat(); struct sway_seat *seat = input_manager_current_seat();
struct sway_workspace *new_ws = seat_get_focused_workspace(seat); struct sway_workspace *new_ws = seat_get_focused_workspace(seat);
@ -153,7 +156,7 @@ void root_scratchpad_show(struct sway_container *con) {
workspace_add_floating(new_ws, con); workspace_add_floating(new_ws, con);
// Set minimize state to normalized // Set minimize state to normalized
root_handle_container(con, true); root_scratchpad_set_minimize(con, false);
// Make sure the container's center point overlaps this workspace // Make sure the container's center point overlaps this workspace
double center_lx = con->pending.x + con->pending.width / 2; double center_lx = con->pending.x + con->pending.width / 2;
@ -187,7 +190,7 @@ void root_scratchpad_hide(struct sway_container *con) {
} }
// Set minimize state to minimized // Set minimize state to minimized
root_handle_container(con, false); root_scratchpad_set_minimize(con, true);
disable_fullscreen(con, NULL); disable_fullscreen(con, NULL);
container_for_each_child(con, disable_fullscreen, NULL); container_for_each_child(con, disable_fullscreen, NULL);