Merge branch 'main' into elevations

This commit is contained in:
K Simmons 2022-10-18 12:47:15 -07:00
commit b0ddbeb0ad
273 changed files with 26504 additions and 15624 deletions

View file

@ -209,9 +209,9 @@ impl ThemeTestbench {
MouseEventHandler::<TestBenchButton>::new(layer_index + button_index, cx, |state, cx| {
let style = if let Some(style_override) = style_override {
style_override(&style_set)
} else if state.clicked.is_some() {
} else if state.clicked().is_some() {
&style_set.pressed
} else if state.hovered {
} else if state.hovered() {
&style_set.hovered
} else {
&style_set.default