Improve view open and close code

This commit is contained in:
Michael Mikovsky
2025-12-13 12:31:12 -07:00
parent 62148cd366
commit 75f1fe1cc2
+10 -11
View File
@@ -35,13 +35,15 @@ impl AppState {
if ui.selectable_label(enabled, *name).clicked() { if ui.selectable_label(enabled, *name).clicked() {
if enabled { if enabled {
// if let Some(tid) = Self::find_pane_id(*key, tree) { self.close_window(tree, key);
// tree.remove_recursively(*tid); } else {
// tree.tiles.remove(*tid); self.open_window(tree, key, name);
// self.open_windows.remove(&key); }
// } }
// let tid = *self.open_windows.get(&key).unwrap(); }
}
pub fn close_window(&mut self, tree: &mut Tree<WindowWrapper>, key: &AppWindow) {
match Self::find_pane_id(*key, tree) { match Self::find_pane_id(*key, tree) {
Some(tid) => { Some(tid) => {
let tid = tid.clone(); let tid = tid.clone();
@@ -51,9 +53,9 @@ impl AppState {
} }
None => unreachable!(), None => unreachable!(),
} }
}
// if self.open_windows.is_empty() pub fn open_window(&mut self, tree: &mut Tree<WindowWrapper>, key: &AppWindow, name: &str) {
} else {
let tid = tree.tiles.insert_pane(WindowWrapper { let tid = tree.tiles.insert_pane(WindowWrapper {
name: name.to_string(), name: name.to_string(),
window: *key, window: *key,
@@ -77,9 +79,6 @@ impl AppState {
} }
self.open_windows.insert(key.clone()); self.open_windows.insert(key.clone());
} }
}
}
}
fn find_pane_id(window_type: AppWindow, tree: &Tree<WindowWrapper>) -> Option<&TileId> { fn find_pane_id(window_type: AppWindow, tree: &Tree<WindowWrapper>) -> Option<&TileId> {
for (tid, window) in tree.tiles.iter() { for (tid, window) in tree.tiles.iter() {