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

chore: update smithay + switch to tracing

Browse source
This commit is contained in:
Victoria Brekenfeld 2023-02-24 17:41:52 +01:00
parent 844ed552b9
commit 35de500c00
35 changed files with 622 additions and 754 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/shell/layout/floating/mod.rs
View file

@ -24,19 +24,11 @@ use crate::{
mod grabs;
pub use self::grabs::*;
#[derive(Debug)]
#[derive(Debug, Default)]
pub struct FloatingLayout {
pub(in crate::shell) space: Space<CosmicMapped>,
}
impl Default for FloatingLayout {
fn default() -> Self {
FloatingLayout {
space: Space::new(None),
}
}
}
impl FloatingLayout {
pub fn new() -> FloatingLayout {
Default::default()

5
src/shell/layout/tiling/mod.rs
View file

@ -31,6 +31,7 @@ use smithay::{
wayland::seat::WaylandFocus,
};
use std::{borrow::Borrow, collections::HashMap, hash::Hash, sync::Arc};
use tracing::debug;
mod grabs;
pub use self::grabs::*;
@ -420,7 +421,7 @@ impl TilingLayout {
});
// remove self
slog_scope::debug!("Remove window {:?}", mapped);
debug!(?mapped, "Remove window.");
let _ = tree.remove_node(node_id.clone(), RemoveBehavior::DropChildren);
// fixup parent node
@ -433,7 +434,7 @@ impl TilingLayout {
if group.len() > 2 {
group.remove_window(position);
} else {
slog_scope::debug!("Removing Group");
debug!("Removing Group");
let other_child =
tree.children_ids(&id).unwrap().cloned().next().unwrap();
let fork_pos = parent_parent_id.as_ref().and_then(|parent_id| {