refactor spawn/task, line input/text area, scoll ux

Author: hewigovens

shell/gpui/src/diff/diff_view/find_bar.rs

@@ -7,13 +7,12 @@ use crate::app::fonts;
 use crate::app::theme::Theme;
 use crate::repo::window::RepoWindow;
 use crate::ui::icons::{self, glyph};
-use crate::ui::input::{LineEdit, line_edit_content};
+use crate::ui::input::{LineInput, line_input_content};
 
 pub(super) fn render_find_bar(
-    query: &LineEdit,
+    query: &LineInput,
     match_count: usize,
     match_current: usize,
-    caret_visible: bool,
     t: &Theme,
     cx: &mut Context<RepoWindow>,
 ) -> AnyElement {
@@ -35,7 +34,7 @@ pub(super) fn render_find_bar(
         .border_b_1()
         .border_color(rgb(t.border))
         .child(icons::icon(glyph::SEARCH, 12., t.fg_dim))
-        .child(search_input(query, caret_visible, t))
+        .child(search_input(query, t))
         .child(
             div()
                 .flex_none()
@@ -47,7 +46,7 @@ pub(super) fn render_find_bar(
         .into_any_element()
 }
 
-fn search_input(query: &LineEdit, caret_visible: bool, t: &Theme) -> AnyElement {
+fn search_input(query: &LineInput, t: &Theme) -> AnyElement {
     let mut input = div()
         .flex()
         .flex_row()
@@ -58,13 +57,7 @@ fn search_input(query: &LineEdit, caret_visible: bool, t: &Theme) -> AnyElement
         .text_size(px(12.))
         .font_family(fonts::mono());
 
-    input = input.child(line_edit_content(
-        query,
-        "Type to find...",
-        caret_visible,
-        t,
-        None,
-    ));
+    input = input.child(line_input_content(query, "Type to find...", t, None));
 
     input.into_any_element()
 }

shell/gpui/src/diff/diff_view/render.rs

@@ -98,16 +98,9 @@ pub fn diff_view(
         }
     };
 
-    let find_bar = find.query.map(|q| {
-        render_find_bar(
-            q,
-            find.match_count,
-            find.match_current,
-            find.caret_visible,
-            &t,
-            cx,
-        )
-    });
+    let find_bar = find
+        .query
+        .map(|q| render_find_bar(q, find.match_count, find.match_current, &t, cx));
 
     let mut root = div()
         .flex()

shell/gpui/src/diff/diff_view/sbs_body.rs

@@ -11,6 +11,7 @@ use super::mouse::{attach_selection_handlers, bounds_capture};
 use crate::app::fonts;
 use crate::app::theme::Theme;
 use crate::diff::SbsSide;
+use crate::diff::line::ROW_HEIGHT;
 use crate::diff::side_by_side::{
     SBS_GUTTER_WIDTH, sbs_new_content, sbs_new_gutter, sbs_old_content, sbs_old_gutter,
 };
@@ -19,6 +20,7 @@ use crate::diff::wrap::{
 };
 use crate::repo::window::{PanelBoundsSlot, RepoWindow};
 use crate::ui::primitives::no_scrollbar_gutter;
+use crate::ui::scrollbar::vertical_uniform_scrollbar;
 
 pub(super) fn side_by_side_body(
     fd: &FileDiff,
@@ -88,7 +90,7 @@ pub(super) fn side_by_side_body(
             rows,
             theme: theme.clone(),
             query,
-            scroll,
+            scroll: scroll.clone(),
             side: SbsSide::New,
             bounds: new_bounds.clone(),
             advance,
@@ -108,13 +110,14 @@ pub(super) fn side_by_side_body(
     let content_panel = |list: UniformList,
                          bounds: PanelBoundsSlot,
                          side: SbsSide,
+                         show_scrollbar: bool,
                          cx: &mut Context<RepoWindow>| {
-        div()
+        let mut panel = div()
             .relative()
             .flex_1()
             .min_w_0()
             .h_full()
-            .child(bounds_capture(bounds))
+            .child(bounds_capture(bounds.clone()))
             .on_mouse_up(
                 MouseButton::Left,
                 cx.listener(move |v, _: &MouseUpEvent, _, cx| {
@@ -126,7 +129,17 @@ pub(super) fn side_by_side_body(
                     }
                 }),
             )
-            .child(no_scrollbar_gutter(list).h_full())
+            .child(no_scrollbar_gutter(list).h_full());
+        if show_scrollbar {
+            panel = panel.child(vertical_uniform_scrollbar(
+                scroll.clone(),
+                bounds,
+                px(count as f32 * ROW_HEIGHT),
+                theme.as_ref(),
+                cx,
+            ));
+        }
+        panel
     };
 
     div()
@@ -135,10 +148,22 @@ pub(super) fn side_by_side_body(
         .h_full()
         .min_h_0()
         .child(gutter_panel(old_gutter))
-        .child(content_panel(old_content, old_bounds, SbsSide::Old, cx))
+        .child(content_panel(
+            old_content,
+            old_bounds,
+            SbsSide::Old,
+            false,
+            cx,
+        ))
         .child(div().flex_none().w(px(1.)).h_full().bg(rgb(theme.border)))
         .child(gutter_panel(new_gutter))
-        .child(content_panel(new_content, new_bounds, SbsSide::New, cx))
+        .child(content_panel(
+            new_content,
+            new_bounds,
+            SbsSide::New,
+            true,
+            cx,
+        ))
         .into_any_element()
 }
 

shell/gpui/src/diff/diff_view/state.rs

@@ -2,7 +2,7 @@ use jayjay_core::DiffHunk;
 use jayjay_core::diff::FileDiff;
 
 use crate::repo::window::PanelBoundsSlot;
-use crate::ui::input::LineEdit;
+use crate::ui::input::LineInput;
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum DiffViewMode {
@@ -32,8 +32,7 @@ pub struct DiffViewState<'a> {
 
 /// Find-in-diff state.
 pub struct FindState<'a> {
-    pub query: Option<&'a LineEdit>,
+    pub query: Option<&'a LineInput>,
     pub match_count: usize,
     pub match_current: usize,
-    pub caret_visible: bool,
 }

shell/gpui/src/diff/diff_view/unified_body.rs

@@ -10,10 +10,11 @@ use super::mouse::{attach_selection_handlers, bounds_capture};
 use crate::app::fonts;
 use crate::app::theme::Theme;
 use crate::diff::SbsSide;
-use crate::diff::line::{GUTTER_WIDTH, content_row, gutter_row};
+use crate::diff::line::{GUTTER_WIDTH, ROW_HEIGHT, content_row, gutter_row};
 use crate::diff::wrap::{selection_cols_in_fragment, wrap_cols_from_bounds, wrap_diff_lines};
 use crate::repo::window::{PanelBoundsSlot, RepoWindow};
 use crate::ui::primitives::no_scrollbar_gutter;
+use crate::ui::scrollbar::vertical_uniform_scrollbar;
 
 pub(super) fn unified_body(
     fd: &FileDiff,
@@ -119,7 +120,14 @@ pub(super) fn unified_body(
                         v.finish_diff_selection(cx);
                     }),
                 )
-                .child(no_scrollbar_gutter(content).h_full()),
+                .child(no_scrollbar_gutter(content).h_full())
+                .child(vertical_uniform_scrollbar(
+                    scroll,
+                    bounds_slot,
+                    px(count as f32 * ROW_HEIGHT),
+                    theme.as_ref(),
+                    cx,
+                )),
         )
         .into_any_element()
 }

shell/gpui/src/repo/toggles.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use gpui::{AppContext, Context};
+use gpui::Context;
 use jayjay_core::dag::DagLayout;
 use jayjay_core::{DEFAULT_REVSET_DEPTH, build_default_revset};
 
@@ -41,11 +41,10 @@ impl RepoViewModel {
         self.clear_error();
         cx.notify();
 
-        cx.spawn(async move |this, cx| {
-            let result = cx
-                .background_spawn(async move { repo.log_graph(&build_default_revset(new_depth)) })
-                .await;
-            let _ = this.update(cx, move |vm, cx| {
+        Self::background_update(
+            cx,
+            async move { repo.log_graph(&build_default_revset(new_depth)) },
+            move |vm, result, cx| {
                 vm.loading.more = false;
                 match result {
                     Ok(entries) => {
@@ -57,9 +56,8 @@ impl RepoViewModel {
                     Err(error) => vm.present_error(error),
                 }
                 cx.notify();
-            });
-        })
-        .detach();
+            },
+        );
     }
 
     pub fn toggle_annotate(&mut self, cx: &mut Context<Self>) {