Merge remote-tracking branch 'origin/main' into save-conversations

2023-06-23 09:09:42 +02:00
parent ff07d0c2ed a305d93567
commit 6f0efec146
112 changed files with 4161 additions and 1653 deletions
@@ -498,7 +498,9 @@ impl View for PanelButtons {
                    Stack::new()
                        .with_child(
                            MouseEventHandler::<Self, _>::new(panel_ix, cx, |state, cx| {
-                                let style = button_style.style_for(state, is_active);
+                                let style = button_style.in_state(is_active);
+
+                                let style = style.style_for(state);
                                Flex::row()
                                    .with_child(
                                        Svg::new(view.icon_path(cx))