mirror of
https://github.com/swaywm/sway.git
synced 2026-04-03 07:15:39 -04:00
tree/workspace: Remove exclude arg from get_highest_available
workspace_output_get_highest_available took an output to exclude as argument, meant to avoid accidentally reselecting an output we are evacuating workspaces from. Outputs are now removed from the list before we evacuate, making exclusion unnecessary. Remove the argument.
This commit is contained in:
parent
005924f260
commit
534491d3aa
3 changed files with 4 additions and 8 deletions
|
|
@ -37,7 +37,7 @@ static void restore_workspaces(struct sway_output *output) {
|
|||
for (int j = 0; j < other->workspaces->length; j++) {
|
||||
struct sway_workspace *ws = other->workspaces->items[j];
|
||||
struct sway_output *highest =
|
||||
workspace_output_get_highest_available(ws, NULL);
|
||||
workspace_output_get_highest_available(ws);
|
||||
if (highest == output) {
|
||||
workspace_detach(ws);
|
||||
output_add_workspace(output, ws);
|
||||
|
|
@ -215,7 +215,7 @@ static void output_evacuate(struct sway_output *output) {
|
|||
workspace_detach(workspace);
|
||||
|
||||
struct sway_output *new_output =
|
||||
workspace_output_get_highest_available(workspace, output);
|
||||
workspace_output_get_highest_available(workspace);
|
||||
if (!new_output) {
|
||||
new_output = fallback_output;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue