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

fix(displays): on display changes, keep same display active

Browse source
This commit is contained in:
Michael Aaron Murphy 2024-04-11 19:38:54 +02:00 • committed by Michael Murphy
parent f3d09b943f
commit 1525da6bea
1 changed files with 15 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cosmic-settings/src/pages/display/mod.rs
View file

@ -487,6 +487,12 @@ impl Page {
/// Reloads the display list, and all information relevant to the active display. /// Reloads the display list, and all information relevant to the active display.
pub fn update_displays(&mut self, list: List) { pub fn update_displays(&mut self, list: List) {
let active_display_name = self
.display_tabs
.text_remove(self.display_tabs.active())
.unwrap_or_default();
let mut active_tab_pos: u16 = 0;
self.active_display = OutputKey::null(); self.active_display = OutputKey::null();
self.display_tabs.clear(); self.display_tabs.clear();
self.list = list; self.list = list;
@ -498,18 +504,21 @@ impl Page {
.map(|(key, output)| (&*output.name, key)) .map(|(key, output)| (&*output.name, key))
.collect::<BTreeMap<_, _>>(); .collect::<BTreeMap<_, _>>();
for (name, id) in sorted_outputs { for (pos, (name, id)) in sorted_outputs.into_iter().enumerate() {
let Some(output) = self.list.outputs.get(id) else { let Some(output) = self.list.outputs.get(id) else {
continue; continue;
}; };
self.display_tabs let text = crate::utils::display_name(&output.name, output.physical);
.insert()
.text(crate::utils::display_name(&output.name, output.physical)) if text == active_display_name {
.data::<OutputKey>(id); active_tab_pos = pos as u16;
}
self.display_tabs.insert().text(text).data::<OutputKey>(id);
} }
self.display_tabs.activate_position(0); self.display_tabs.activate_position(active_tab_pos);
// Retrieve data for the first, activated display. // Retrieve data for the first, activated display.
self.set_display(self.display_tabs.active()); self.set_display(self.display_tabs.active());