Skip to content

[fix] fullsreen: remove grey bars, reposition popups #1658

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
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[fix] fullsreen: remove grey bars, reposition popups #1658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de63c57
Fix bars when full screen, reposition popups
peterkrull Sep 20, 2025
4bff384
cargo fmt
peterkrull Sep 20, 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
21 changes: 15 additions & 6 deletions src/shell/workspace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1505,7 +1505,6 @@ impl Workspace {
let focused = self.focus_stack.get(last_active_seat).last().cloned();

let mut fullscreen_elements = if let Some(fullscreen) = self.fullscreen.as_ref() {
let bbox = fullscreen.surface.bbox();
let fullscreen_geo = self.fullscreen_geometry().unwrap();
let previous_geo = fullscreen
.previous_geometry
Expand Down Expand Up @@ -1548,9 +1547,20 @@ impl Workspace {
.loc
.as_logical()
.to_physical_precise_round(output_scale);
let scale = Scale {
x: target_geo.size.w as f64 / bbox.size.w as f64,
y: target_geo.size.h as f64 / bbox.size.h as f64,

// Only rescale geometry when animating
let animation_rescale = |elem| {
if fullscreen.is_animating() {
let fullscreen_geo = fullscreen.surface.0.geometry();
let scale = Scale {
x: target_geo.size.w as f64 / fullscreen_geo.size.w as f64,
y: target_geo.size.h as f64 / fullscreen_geo.size.h as f64,
};

RescaleRenderElement::from_element(elem, render_loc, scale).into()
} else {
Into::<WorkspaceRenderElement<_>>::into(elem)
}
};

fullscreen
Expand All @@ -1563,8 +1573,7 @@ impl Workspace {
Some(true),
)
.into_iter()
.map(|elem| RescaleRenderElement::from_element(elem, render_loc, scale))
.map(Into::into)
.map(animation_rescale)
.collect::<Vec<_>>()
} else {
Vec::new()
Expand Down
7 changes: 7 additions & 0 deletions src/wayland/handlers/xdg_shell/popup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ impl Shell {
} else {
unconstrain_xdg_popup(surface, window_loc, output.geometry());
}
} else if let Some(output) = self.workspaces.spaces().find_map(|w| {
w.fullscreen.as_ref().and_then(|f| {
(f.surface.wl_surface().as_deref() == Some(&parent)).then_some(w.output())
})
}) {
let window_loc = output.geometry().loc;
unconstrain_xdg_popup(surface, window_loc, output.geometry());
} else if let Some((output, layer_surface)) = self.outputs().find_map(|o| {
let map = layer_map_for_output(o);
map.layer_for_surface(&parent, WindowSurfaceType::ALL)
Expand Down
Loading