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

Merge branch 'main' into project-panel-context-menu

Browse source
This commit is contained in:
Max Brunsfeld 2023-11-29 09:44:48 -08:00
commit dbfc7d3555
64 changed files with 4038 additions and 2696 deletions
Download patch file Download diff file Expand all files Collapse all files

1195
crates/collab_ui2/src/collab_panel.rs
View file

File diff suppressed because it is too large Load diff

1
crates/collab_ui2/src/collab_panel/contact_finder.rs
View file

@ -181,7 +181,6 @@ impl PickerDelegate for ContactFinderDelegate {
ContactRequestStatus::RequestSent => Some("icons/x.svg"),
ContactRequestStatus::RequestAccepted => None,
};
dbg!(icon_path);
Some(
div()
.flex_1()

26
crates/collab_ui2/src/collab_titlebar_item.rs
View file

@ -37,7 +37,10 @@ use gpui::{
};
use project::Project;
use theme::ActiveTheme;
use ui::{h_stack, Avatar, Button, ButtonVariant, Color, IconButton, KeyBinding, Tooltip};
use ui::{
h_stack, Avatar, Button, ButtonCommon, ButtonLike, ButtonVariant, Clickable, Color, IconButton,
IconElement, IconSize, KeyBinding, Tooltip,
};
use util::ResultExt;
use workspace::{notifications::NotifyResultExt, Workspace};
@ -298,6 +301,27 @@ impl Render for CollabTitlebarItem {
})
.detach();
}))
// Temporary, will be removed when the last part of button2 is merged
.child(
div().border().border_color(gpui::blue()).child(
ButtonLike::new("test-button")
.children([
Avatar::uri(
"https://avatars.githubusercontent.com/u/1714999?v=4",
)
.into_element()
.into_any(),
IconElement::new(ui::Icon::ChevronDown)
.size(IconSize::Small)
.into_element()
.into_any(),
])
.on_click(move |event, _cx| {
dbg!(format!("clicked: {:?}", event.down.position));
})
.tooltip(|cx| Tooltip::text("Test tooltip", cx)),
),
)
}
})
}