Reconcile with upstream changes

2023-10-12 10:40:47 -04:00
parent 9581279919
commit 8cd112110e
44 changed files with 112 additions and 107 deletions
@@ -15,7 +15,7 @@ impl<S: 'static + Send + Sync> ToolDivider<S> {
        }
    }

-    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);

        div().w_px().h_3().fill(theme.lowest.base.default.border)