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

Checkpoint – Broken

Browse source
This commit is contained in:
Nate Butler 2023-10-19 12:58:17 -04:00
parent b16d37953d
commit bca97f7186
33 changed files with 183 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

50
crates/ui2/src/components/collab_panel.rs
View file

@ -24,7 +24,7 @@ impl<S: 'static + Send + Sync + Clone> CollabPanel<S> {
}
fn render(&mut self, _view: &mut S, cx: &mut ViewContext<S>) -> impl Element<ViewState = S> {
let theme = theme(cx);
let color = ThemeColor::new(cx);
let color = ThemeColor::new(cx);
v_stack()
@ -35,20 +35,15 @@ impl<S: 'static + Send + Sync + Clone> CollabPanel<S> {
.w_full()
.overflow_y_scroll(self.scroll_state.clone())
.child(
div()
.bg(theme.lowest.base.default.background)
.pb_1()
.border_color(theme.lowest.base.default.border)
.border_b()
.child(
List::new(static_collab_panel_current_call())
.header(
ListHeader::new("CRDB")
.set_left_icon(Icon::Hash.into())
.set_toggle(ToggleState::Toggled),
)
.set_toggle(ToggleState::Toggled),
),
div().pb_1().border_color(color.border).border_b().child(
List::new(static_collab_panel_current_call())
.header(
ListHeader::new("CRDB")
.set_left_icon(Icon::Hash.into())
.set_toggle(ToggleState::Toggled),
)
.set_toggle(ToggleState::Toggled),
),
)
.child(
v_stack().py_1().child(
@ -86,13 +81,13 @@ impl<S: 'static + Send + Sync + Clone> CollabPanel<S> {
.h_7()
.px_2()
.border_t()
.border_color(theme.middle.variant.default.border)
.border_color(color.border)
.flex()
.items_center()
.child(
div()
.text_sm()
.text_color(theme.middle.variant.default.foreground)
.text_color(color.text_placeholder)
.child("Find..."),
),
)
@ -102,8 +97,9 @@ impl<S: 'static + Send + Sync + Clone> CollabPanel<S> {
&self,
label: impl Into<SharedString>,
expanded: bool,
theme: &Theme,
cx: &WindowContext,
) -> impl Element<ViewState = S> {
let color = ThemeColor::new(cx);
div()
.h_7()
.px_2()
@ -121,7 +117,7 @@ impl<S: 'static + Send + Sync + Clone> CollabPanel<S> {
})
.w_3p5()
.h_3p5()
.text_color(theme.middle.variant.default.foreground),
.text_color(color.icon_muted),
),
)
}
@ -130,14 +126,16 @@ impl<S: 'static + Send + Sync + Clone> CollabPanel<S> {
&self,
avatar_uri: impl Into<SharedString>,
label: impl Into<SharedString>,
theme: &Theme,
cx: &WindowContext,
) -> impl Element<ViewState = S> {
let color = ThemeColor::new(cx);
div()
.h_7()
.px_2()
.flex()
.items_center()
.hover(|style| style.bg(theme.lowest.variant.hovered.background))
.hover(|style| style.bg(color.ghost_element_hover))
// .active(|style| style.fill(theme.lowest.variant.pressed.background))
.child(
div()
@ -146,11 +144,11 @@ impl<S: 'static + Send + Sync + Clone> CollabPanel<S> {
.gap_1()
.text_sm()
.child(
img().uri(avatar_uri).size_3p5().rounded_full().bg(theme
.middle
.positive
.default
.foreground),
img()
.uri(avatar_uri)
.size_3p5()
.rounded_full()
.bg(color.image_fallback_background),
)
.child(label.into()),
)