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

Rename Join button to Open, rework message slightly

Browse source
This commit is contained in:
Nathan Sobo 2022-10-10 18:12:00 -06:00
parent b8c2acf0f2
commit e0b6b0df2a
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
crates/collab_ui/src/project_shared_notification.rs
View file

@ -102,7 +102,7 @@ impl ProjectSharedNotification {
.with_child( .with_child(
Label::new( Label::new(
format!( format!(
"shared a project in Zed{}", "is sharing a project in Zed{}",
if self.worktree_root_names.is_empty() { if self.worktree_root_names.is_empty() {
"" ""
} else { } else {
@ -140,7 +140,7 @@ impl ProjectSharedNotification {
} }
fn render_buttons(&self, cx: &mut RenderContext<Self>) -> ElementBox { fn render_buttons(&self, cx: &mut RenderContext<Self>) -> ElementBox {
enum Join {} enum Open {}
enum Dismiss {} enum Dismiss {}
let project_id = self.project_id; let project_id = self.project_id;
@ -148,12 +148,12 @@ impl ProjectSharedNotification {
Flex::column() Flex::column()
.with_child( .with_child(
MouseEventHandler::<Join>::new(0, cx, |_, cx| { MouseEventHandler::<Open>::new(0, cx, |_, cx| {
let theme = &cx.global::<Settings>().theme.project_shared_notification; let theme = &cx.global::<Settings>().theme.project_shared_notification;
Label::new("Join".to_string(), theme.join_button.text.clone()) Label::new("Open".to_string(), theme.open_button.text.clone())
.aligned() .aligned()
.contained() .contained()
.with_style(theme.join_button.container) .with_style(theme.open_button.container)
.boxed() .boxed()
}) })
.with_cursor_style(CursorStyle::PointingHand) .with_cursor_style(CursorStyle::PointingHand)

2
crates/theme/src/theme.rs
View file

@ -482,7 +482,7 @@ pub struct ProjectSharedNotification {
pub message: ContainedText, pub message: ContainedText,
pub worktree_roots: ContainedText, pub worktree_roots: ContainedText,
pub button_width: f32, pub button_width: f32,
pub join_button: ContainedText, pub open_button: ContainedText,
pub dismiss_button: ContainedText, pub dismiss_button: ContainedText,
} }

4
styles/src/styleTree/projectSharedNotification.ts
View file

@ -5,7 +5,7 @@ export default function projectSharedNotification(theme: Theme): Object {
const avatarSize = 48; const avatarSize = 48;
return { return {
windowHeight: 72, windowHeight: 72,
windowWidth: 360, windowWidth: 380,
background: backgroundColor(theme, 300), background: backgroundColor(theme, 300),
ownerContainer: { ownerContainer: {
padding: 12, padding: 12,
@ -31,7 +31,7 @@ export default function projectSharedNotification(theme: Theme): Object {
margin: { top: -3 }, margin: { top: -3 },
}, },
buttonWidth: 96, buttonWidth: 96,
joinButton: { openButton: {
background: backgroundColor(theme, "info", "active"), background: backgroundColor(theme, "info", "active"),
border: { left: true, bottom: true, width: 1, color: borderColor(theme, "primary") }, border: { left: true, bottom: true, width: 1, color: borderColor(theme, "primary") },
...text(theme, "sans", "info", { size: "xs", weight: "extra_bold" }) ...text(theme, "sans", "info", { size: "xs", weight: "extra_bold" })