diff --git a/src/screen/dashboard/pull_request_view.rs b/src/screen/dashboard/pull_request_view.rs index 5cc4e61..84d972e 100644 --- a/src/screen/dashboard/pull_request_view.rs +++ b/src/screen/dashboard/pull_request_view.rs @@ -141,27 +141,6 @@ impl PullRequestView { cx.notify(); })), ) - .child(div().flex_1()) - .child( - toolbar_button("pr-close-btn") - .leading(font_icon(FontIcon::PullRequestClosed)) - .mr_1(), - ) - .child( - toolbar_button("pr-merge-btn") - .variant(button::Variant::Primary) - .leading(font_icon(FontIcon::GitMerge)) - .rounded_r_none(), - ) - .child(divider()) - .child( - toolbar_button("chevron") - .py_1() - .px_0p5() - .variant(button::Variant::Primary) - .leading(font_icon(FontIcon::ChevronDown)) - .rounded_l_none(), - ) .into_any_element() } @@ -181,41 +160,41 @@ impl PullRequestView { .rounded_full(); match pr.state { - | api::issues::PullRequestState::Open => { - status_pill = status_pill - .bg(theme.colors.success_solid) - .child( - font_icon(FontIcon::PullRequestArrow) - .size_3() - .text_color(theme.colors.success_on_solid), - ) - .child( - text("Open") - .text_color(theme.colors.success_on_solid) - .text_xs(), - ); - } - | api::issues::PullRequestState::Closed => { - status_pill = status_pill - .bg(theme.colors.danger_solid) - .child( - font_icon(FontIcon::PullRequestClosed) - .size_3() - .text_color(theme.colors.danger_on_solid), - ) - .child( - text("Closed") - .text_color(theme.colors.danger_on_solid) - .text_xs(), - ); - } - | api::issues::PullRequestState::Merged => { - status_pill = status_pill.bg(theme.colors.accent_solid).child( - text("Merged") - .text_color(theme.colors.accent_on_solid) + | api::issues::PullRequestState::Open => { + status_pill = status_pill + .bg(theme.colors.success_solid) + .child( + font_icon(FontIcon::PullRequestArrow) + .size_3() + .text_color(theme.colors.success_on_solid), + ) + .child( + text("Open") + .text_color(theme.colors.success_on_solid) .text_xs(), ); - } + } + | api::issues::PullRequestState::Closed => { + status_pill = status_pill + .bg(theme.colors.danger_solid) + .child( + font_icon(FontIcon::PullRequestClosed) + .size_3() + .text_color(theme.colors.danger_on_solid), + ) + .child( + text("Closed") + .text_color(theme.colors.danger_on_solid) + .text_xs(), + ); + } + | api::issues::PullRequestState::Merged => { + status_pill = status_pill.bg(theme.colors.accent_solid).child( + text("Merged") + .text_color(theme.colors.accent_on_solid) + .text_xs(), + ); + } } let merge_text = pr.author.as_ref().map(|author| { @@ -354,23 +333,25 @@ impl gpui::Render for PullRequestView { .flex_col() .child(self.toolbar(cx)) .child(match &self.pull_request_query { - | Some(q) => match read_query(q, cx) { - | QueryStatus::Loaded(pr) => match (&self.diff_view, self.current_tab) { - | (Some(diff_view), Tab::DiffView) => diff_view.clone().into_any_element(), - | _ => self.pr_content(pr, cx), - }, - - | QueryStatus::Err(e) => div() - .size_full() - .child(format!("{:?}", e)) - .into_any_element(), - | QueryStatus::Loading => div() - .size_full() - .child("loading pr content") - .into_any_element(), + | Some(q) => { + match read_query(q, cx) { + | QueryStatus::Loaded(pr) => match (&self.diff_view, self.current_tab) { + | (Some(diff_view), Tab::DiffView) => diff_view.clone().into_any_element(), + | _ => self.pr_content(pr, cx), }, - | None => div().size_full().child("no pr selected").into_any_element(), + | QueryStatus::Err(e) => div() + .size_full() + .child(format!("{:?}", e)) + .into_any_element(), + | QueryStatus::Loading => div() + .size_full() + .child("loading pr content") + .into_any_element(), + } + } + + | None => div().size_full().child("no pr selected").into_any_element(), }) } }