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

feat: memorize last active page between instances

Browse source
This commit is contained in:
Michael Aaron Murphy 2023-01-27 03:10:54 +01:00
parent 2709dcfee5
commit 9d3c3405a2
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
23 changed files with 252 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/app.rs
View file

@ -18,6 +18,7 @@ use cosmic::{
};
use crate::{
config::{self, Config},
page::{self, desktop, section, sound, system, time, Page},
widget::{page_title, parent_page_button, search_header, sub_page_button},
};
@ -27,6 +28,7 @@ use crate::{
pub struct SettingsApp {
pub active_page: page::Entity,
pub config: Config,
pub config_path: config::PathManager,
pub debug: bool,
pub is_condensed: bool,
pub nav_bar_toggled_condensed: bool,
@ -43,11 +45,6 @@ pub struct SettingsApp {
pub window_width: u32,
}
#[derive(Debug, Default)]
pub struct Config {
nav_page: &'static str,
}
#[allow(dead_code)]
#[derive(Clone, Debug)]
pub enum Message {
@ -73,11 +70,12 @@ impl Application for SettingsApp {
type Theme = Theme;
fn new(_flags: ()) -> (Self, Command<Self::Message>) {
let mut config_path = config::PathManager::new();
let mut app = SettingsApp {
active_page: page::Entity::default(),
config: Config {
nav_page: "desktop",
},
config: config_path.config("main", Config::deserialize),
config_path,
debug: false,
is_condensed: false,
nav_bar: segmented_button::Model::default(),
@ -119,7 +117,12 @@ impl Application for SettingsApp {
// app.insert_page::<accessibility::Page>();
// app.insert_page::<applications::Page>();
app.activate_navbar(app.active_page);
for (id, info) in app.pages.pages.iter() {
if info.id == &*app.config.active_page {
app.activate_page(id);
break;
}
}
(app, Command::none())
}
@ -299,8 +302,15 @@ impl SettingsApp {
/// Activates a page.
fn activate_page(&mut self, page: page::Entity) {
self.nav_bar_toggled_condensed = false;
let current_page = self.active_page;
self.active_page = page;
if current_page != page {
self.config.active_page = Box::from(self.pages.pages[page].id);
self.config_path
.config("main", |path| self.config.serialize(path));
}
self.search_clear();
self.search.state = search::State::Inactive;
self.activate_navbar(page);
@ -320,13 +330,8 @@ impl SettingsApp {
/// Adds a main page to the settings application.
fn insert_page<P: Page>(&mut self) -> page::Insert {
let id = self.pages.register::<P>().id();
self.navbar_insert(id);
if P::PERSISTENT_ID == self.config.nav_page {
self.active_page = id;
}
page::Insert {
model: &mut self.pages,
id,