leyoda/cosmic-comp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

shell: better tiling check for popup constraining

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-02-13 20:27:12 +01:00
parent 05fadbbc85
commit 386501f980
2 changed files with 20 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/shell/workspace.rs
View file

@ -393,8 +393,26 @@ impl Workspace {
.chain(self.tiling_layer.windows().map(|(_, w, _)| w))
}
pub fn is_fullscreen(&self, mapped: &CosmicMapped) -> bool {
self.fullscreen
.values()
.any(|s| s == &mapped.active_window())
}
pub fn is_floating(&self, mapped: &CosmicMapped) -> bool {
self.floating_layer.mapped().any(|m| m == mapped)
!self
.fullscreen
.values()
.any(|s| s == &mapped.active_window())
&& self.floating_layer.mapped().any(|m| m == mapped)
}
pub fn is_tiled(&self, mapped: &CosmicMapped) -> bool {
!self
.fullscreen
.values()
.any(|s| s == &mapped.active_window())
&& self.tiling_layer.mapped().any(|(_, m, _)| m == mapped)
}
pub fn render_output<'a, R>(

2
src/wayland/handlers/xdg_shell/popup.rs
View file

@ -38,7 +38,7 @@ impl Shell {
let window_geo_offset = window.geometry().loc;
let window_loc = element_geo.loc + offset + window_geo_offset;
let anchor_point = get_anchor_point(&positioner) + window_loc;
if elem.is_tiled().unwrap() {
if workspace.is_tiled(elem) {
if !unconstrain_xdg_popup_tile(surface, element_geo) {
if let Some(output) = workspace.output_under(anchor_point) {
unconstrain_xdg_popup(surface, window_loc, output.geometry());