vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

anvil: split `bring_nth_window_to_top` to separate fn

This commit is contained in:
Poly 2021-07-31 22:36:55 +02:00
parent 3721b515f7
commit 524501b2e8
1 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
anvil/src/window_map.rs
View File

@ -300,26 +300,29 @@ impl WindowMap {
None None
} }
fn bring_nth_window_to_top(&mut self, id: usize) {
let winner = self.windows.remove(id);
// Take activation away from all the windows
for window in self.windows.iter() {
window.toplevel.set_activated(false);
}
// Give activation to our winner
winner.toplevel.set_activated(true);
self.windows.insert(0, winner);
}
pub fn bring_surface_to_top(&mut self, surface: &WlSurface) { pub fn bring_surface_to_top(&mut self, surface: &WlSurface) {
let found = self.windows.iter().enumerate().find(|(_, w)| { let found = self.windows.iter().enumerate().find(|(_, w)| {
if let Some(s) = w.toplevel.get_surface() { w.toplevel
s.as_ref().equals(surface.as_ref()) .get_surface()
} else { .map(|s| s.as_ref().equals(surface.as_ref()))
false .unwrap_or(false)
}
}); });
if let Some((i, _)) = found { if let Some((id, _)) = found {
let winner = self.windows.remove(i); self.bring_nth_window_to_top(id);
// Take activation away from all the windows
for window in self.windows.iter() {
window.toplevel.set_activated(false);
}
// Give activation to our winner
winner.toplevel.set_activated(true);
self.windows.insert(0, winner);
} }
} }
@ -334,18 +337,8 @@ impl WindowMap {
break; break;
} }
} }
if let Some((i, surface)) = found { if let Some((id, surface)) = found {
let winner = self.windows.remove(i); self.bring_nth_window_to_top(id);
// Take activation away from all the windows
for window in self.windows.iter() {
window.toplevel.set_activated(false);
}
// Give activation to our winner
winner.toplevel.set_activated(true);
self.windows.insert(0, winner);
Some(surface) Some(surface)
} else { } else {
None None