Skip to content

xdg-shell: dont overwrite for_window scratchpad geometry #8927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sahinf wants to merge 3 commits into
base: master
Choose a base branch
from
+3 −7
Open

xdg-shell: dont overwrite for_window scratchpad geometry #8927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
828b604
xdg-shell: dont overwrite for_window scratchpad geometry
sahinf Oct 23, 2025
3cd38f6
fix for_window[floating] criteria
sahinf Oct 24, 2025
2f776c5
commands/floating: commit changes
sahinf Oct 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions sway/commands/floating.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#include <string.h>
#include <strings.h>
#include "sway/commands.h"
#include "sway/desktop/transaction.h"
#include "sway/input/seat.h"
#include "sway/ipc-server.h"
#include "sway/output.h"
Expand Down Expand Up @@ -53,6 +54,7 @@ struct cmd_results *cmd_floating(int argc, char **argv) {
// Floating containers in the scratchpad should be ignored
if (container->pending.workspace) {
arrange_workspace(container->pending.workspace);
transaction_commit_dirty();
}

return cmd_results_new(CMD_SUCCESS, NULL);
Expand Down
6 changes: 0 additions & 6 deletions sway/criteria.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,12 +415,6 @@ static bool criteria_matches_view(struct criteria *criteria,
}
#endif

if (criteria->floating) {
if (!container_is_floating(view->container)) {
return false;
}
}

if (criteria->tiling) {
if (container_is_floating(view->container)) {
return false;
Expand Down
2 changes: 1 addition & 1 deletion sway/desktop/xdg_shell.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ static void handle_commit(struct wl_listener *listener, void *data) {
// containers, we resize the container to match. For tiling containers,
// we only recenter the surface.
memcpy(&view->geometry, new_geo, sizeof(struct wlr_box));
if (container_is_floating(view->container)) {
if (container_is_floating(view->container) && !container_is_scratchpad_hidden(view->container)) {
view_update_size(view);
// Only set the toplevel size the current container actually has a size.
if (view->container->current.width) {
Expand Down