Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up ButtonLike

Browse source 
Co-Authored-By: Marshall Bowers <1486634+maxdeviant@users.noreply.github.com>
This commit is contained in:
Nate Butler 2023-12-04 11:32:25 -05:00
parent b6ed3b258c
commit 7a0aa1e5df
1 changed files with 4 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/ui2/src/components/button/button_like.rs
View file

@ -323,23 +323,13 @@ impl RenderOnce for ButtonLike {
.id(self.id.clone()) .id(self.id.clone())
.h(self.size.height()) .h(self.size.height())
.rounded_md() .rounded_md()
.when(!self.disabled, |el| el.cursor_pointer())
.gap_1() .gap_1()
.px_1() .px_1()
.bg(self.style.enabled(cx).background) .bg(self.style.enabled(cx).background)
.hover(|hover| { .when(!self.disabled, |this| {
hover.bg(if self.disabled { this.cursor_pointer()
self.style.disabled(cx).background .hover(|hover| hover.bg(self.style.hovered(cx).background))
} else { .active(|active| active.bg(self.style.active(cx).background))
self.style.hovered(cx).background
})
})
.active(|active| {
active.bg(if self.disabled {
self.style.disabled(cx).background
} else {
self.style.active(cx).background
})
}) })
.when_some( .when_some(
self.on_click.filter(|_| !self.disabled), self.on_click.filter(|_| !self.disabled),