fix(appearance): 'Reset to default' not appearing
This commit is contained in:
parent
a0245a29e8
commit
b46a55d423
1 changed files with 11 additions and 5 deletions
|
|
@ -491,6 +491,8 @@ impl Page {
|
||||||
|
|
||||||
self.drawer.reset(&self.theme_manager);
|
self.drawer.reset(&self.theme_manager);
|
||||||
|
|
||||||
|
self.can_reset = self.can_reset();
|
||||||
|
|
||||||
return cosmic::task::future(async move {
|
return cosmic::task::future(async move {
|
||||||
app::Message::SetTheme(cosmic::theme::system_preference())
|
app::Message::SetTheme(cosmic::theme::system_preference())
|
||||||
});
|
});
|
||||||
|
|
@ -541,11 +543,7 @@ impl Page {
|
||||||
tasks = tasks.chain(self.theme_manager.build_theme(stage))
|
tasks = tasks.chain(self.theme_manager.build_theme(stage))
|
||||||
}
|
}
|
||||||
|
|
||||||
self.can_reset = if self.theme_manager.mode().is_dark {
|
self.can_reset = self.can_reset();
|
||||||
*self.theme_manager.builder() != ThemeBuilder::dark()
|
|
||||||
} else {
|
|
||||||
*self.theme_manager.builder() != ThemeBuilder::light()
|
|
||||||
};
|
|
||||||
|
|
||||||
tasks
|
tasks
|
||||||
}
|
}
|
||||||
|
|
@ -659,6 +657,14 @@ impl Page {
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn can_reset(&self) -> bool {
|
||||||
|
if self.theme_manager.mode().is_dark {
|
||||||
|
*self.theme_manager.builder() != ThemeBuilder::dark()
|
||||||
|
} else {
|
||||||
|
*self.theme_manager.builder() != ThemeBuilder::light()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl page::Page<crate::pages::Message> for Page {
|
impl page::Page<crate::pages::Message> for Page {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue