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

shell: rename space_for_{window -> surface}

Browse source
This commit is contained in:
Victoria Brekenfeld 2022-07-11 22:39:56 +02:00
parent 4de316cbce
commit 8ecc1345a6
6 changed files with 14 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/shell/focus.rs
View file

@ -120,7 +120,7 @@ impl Shell {
) {
// update FocusStack and notify layouts about new focus (if any window)
if let Some(surface) = surface {
if let Some(workspace) = self.space_for_surface_mut(surface) {
if let Some(workspace) = self.space_for_window_mut(surface) {
if let Some(window) = workspace
.space
.window_for_surface(surface, WindowSurfaceType::ALL)

2
src/shell/grabs.rs
View file

@ -34,7 +34,7 @@ impl Shell {
) {
// TODO touch grab
if let Some(pointer) = seat.get_pointer() {
let workspace = self.space_for_surface_mut(window.toplevel().wl_surface()).unwrap();
let workspace = self.space_for_window_mut(window.toplevel().wl_surface()).unwrap();
if workspace.fullscreen.values().any(|w| w == window) {
return;
}

4
src/shell/mod.rs
View file

@ -458,7 +458,7 @@ impl Shell {
}
}
pub fn space_for_surface(&self, surface: &WlSurface) -> Option<&Workspace> {
pub fn space_for_window(&self, surface: &WlSurface) -> Option<&Workspace> {
self.spaces.iter().find(|workspace| {
workspace
.space
@ -467,7 +467,7 @@ impl Shell {
})
}
pub fn space_for_surface_mut(&mut self, surface: &WlSurface) -> Option<&mut Workspace> {
pub fn space_for_window_mut(&mut self, surface: &WlSurface) -> Option<&mut Workspace> {
self.spaces.iter_mut().find(|workspace| {
workspace
.space