Skip to content

Fix scratchpad window visibility toggle and mapping #240

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

Merged
paperbenni merged 2 commits into from
Mar 20, 2026
Merged

Fix scratchpad window visibility toggle and mapping #240

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d34ae3a
fix(scratchpad): properly map and unmap scratchpad windows
google-labs-jules[bot] Mar 20, 2026
a83fb45
fix(scratchpad): properly map and unmap scratchpad windows
google-labs-jules[bot] Mar 20, 2026
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
35 changes: 20 additions & 15 deletions src/floating/scratchpad.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::contexts::WmCtx;
use crate::globals::Globals;
use crate::layouts::{arrange, restack};
use crate::layouts::arrange;
use crate::types::{SCRATCHPAD_MASK, WindowId};
use bincode::{Decode, Encode};

Expand Down Expand Up @@ -75,11 +75,7 @@ pub fn scratchpad_make(ctx: &mut WmCtx, name: &str, window_id: Option<WindowId>)
client.is_floating = true;
}

let selected_monitor_id = ctx.core_mut().globals_mut().selected_monitor_id();
crate::focus::focus_soft(ctx, None);
if !ctx.core_mut().globals_mut().monitors.is_empty() {
arrange(ctx, Some(selected_monitor_id));
}
crate::client::hide(ctx, selected_window);
}

pub fn scratchpad_unmake(ctx: &mut WmCtx, window_id: Option<WindowId>) {
Expand All @@ -103,7 +99,9 @@ pub fn scratchpad_unmake(ctx: &mut WmCtx, window_id: Option<WindowId>) {
let restore_tags = client.scratchpad_restore_tags;
let monitor_id = client.monitor_id;

let mut was_hidden = false;
if let Some(client) = ctx.client_mut(selected_window) {
was_hidden = client.is_hidden;
client.scratchpad_name.clear();
client.issticky = false;
client.tags = if restore_tags != 0 {
Expand All @@ -114,7 +112,11 @@ pub fn scratchpad_unmake(ctx: &mut WmCtx, window_id: Option<WindowId>) {
client.scratchpad_restore_tags = 0;
}

arrange(ctx, Some(monitor_id));
if was_hidden {
crate::client::show(ctx, selected_window);
} else {
arrange(ctx, Some(monitor_id));
}
}

pub fn scratchpad_show_name(ctx: &mut WmCtx, name: &str) -> Result<String, String> {
Expand Down Expand Up @@ -160,14 +162,19 @@ pub fn scratchpad_show_name(ctx: &mut WmCtx, name: &str) -> Result<String, Strin
}

let focusfollowsmouse = ctx.core_mut().globals_mut().behavior.focus_follows_mouse;
if !ctx.core_mut().globals_mut().monitors.is_empty() {

let is_hidden = ctx.core().globals().clients.get(&found).map(|c| c.is_hidden).unwrap_or(false);
if is_hidden {
crate::client::show(ctx, found);
} else {
let mid = ctx.core_mut().globals_mut().selected_monitor_id();
crate::focus::focus_soft(ctx, Some(found));
arrange(ctx, Some(mid));
restack(ctx, mid);
if focusfollowsmouse {
ctx.warp_cursor_to_client(found);
}
crate::layouts::restack(ctx, mid);
}

if focusfollowsmouse {
ctx.warp_cursor_to_client(found);
}

Ok(format!("shown scratchpad '{}'", name))
Expand Down Expand Up @@ -213,13 +220,11 @@ pub fn scratchpad_hide_name(ctx: &mut WmCtx, name: &str) {
if !client.issticky {
return;
}
let monitor_id = client.monitor_id;

client.issticky = false;
client.tags = SCRATCHPAD_MASK;

crate::focus::focus_soft(ctx, None);
arrange(ctx, Some(monitor_id));
crate::client::hide(ctx, found);
}

pub fn scratchpad_toggle(ctx: &mut WmCtx, name: Option<&str>) {
Expand Down
Loading