Reconcile with upstream changes

This commit is contained in:
Marshall Bowers 2023-10-12 10:40:47 -04:00
parent 9581279919
commit 8cd112110e
44 changed files with 112 additions and 107 deletions

View file

@ -66,7 +66,7 @@ impl<S: 'static + Send + Sync> IconButton<S> {
self
}
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<State = S> {
fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<ViewState = S> {
let theme = theme(cx);
let icon_color = match (self.state, self.color) {