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

refactor: make get_popup_toplevel() PopupKind agnostic

Browse source 
- for preparation to make unconstrain_popup() PopupKind agnostic.
This commit is contained in:
KENZ 2026-04-24 05:35:41 +09:00 • committed by Jacob Kauffmann
parent b5a1a6d317
commit 977d4c2dca
5 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,7 +24,7 @@ use tracing::warn;
impl Shell {
pub fn unconstrain_popup(&self, surface: &PopupSurface) {
if let Some(parent) = get_popup_toplevel(surface) {
if let Some(parent) = get_popup_toplevel(&PopupKind::from(surface.clone())) {
if let Some(elem) = self.element_for_surface(&parent) {
let (mut element_geo, output, is_tiled) =
if let Some(workspace) = self.space_for(elem) {
@ -173,8 +173,11 @@ fn unconstrain_layer_popup(surface: &PopupSurface, output: &Output, layer_surfac
});
}
pub fn get_popup_toplevel(popup: &PopupSurface) -> Option<WlSurface> {
let mut parent = popup.get_parent_surface()?;
pub fn get_popup_toplevel(popup: &PopupKind) -> Option<WlSurface> {
let mut parent = match popup {
PopupKind::Xdg(popup) => popup.get_parent_surface()?,
PopupKind::InputMethod(popup) => popup.get_parent()?.surface.clone(),
};
while get_role(&parent) == Some(XDG_POPUP_ROLE) {
parent = with_states(&parent, |states| {
states