From 55c47305c8c6da530f1a988aa205a879723a9af2 Mon Sep 17 00:00:00 2001
From: Antonio Scandurra <me@as-cii.com>
Date: Thu, 30 May 2024 14:29:17 +0200
Subject: [PATCH] Align the inline assistant correctly (#12478)

Release Notes:

- Fixed the the alignment for the inline assistant.
---
 crates/assistant/src/assistant_panel.rs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/crates/assistant/src/assistant_panel.rs b/crates/assistant/src/assistant_panel.rs
index 26aecfbe5fe06ae4374c1cabf98bd6c1575b126d..5e70f84d153f7738a87843b150055f5e6a4693cd 100644
--- a/crates/assistant/src/assistant_panel.rs
+++ b/crates/assistant/src/assistant_panel.rs
@@ -447,8 +447,8 @@ impl AssistantPanel {
                         let inline_assistant = inline_assistant.clone();
                         move |cx: &mut BlockContext| {
                             *measurements.lock() = BlockMeasurements {
-                                anchor_x: cx.anchor_x,
                                 gutter_width: cx.gutter_dimensions.width,
+                                gutter_margin: cx.gutter_dimensions.margin,
                             };
                             inline_assistant.clone().into_any_element()
                         }
@@ -3465,8 +3465,7 @@ impl Render for InlineAssistant {
             .on_action(cx.listener(Self::move_down))
             .child(
                 h_flex()
-                    .justify_center()
-                    .w(measurements.gutter_width)
+                    .w(measurements.gutter_width + measurements.gutter_margin)
                     .children(if let Some(error) = self.codegen.read(cx).error() {
                         let error_message = SharedString::from(error.to_string());
                         Some(
@@ -3479,12 +3478,7 @@ impl Render for InlineAssistant {
                         None
                     }),
             )
-            .child(
-                h_flex()
-                    .w_full()
-                    .ml(measurements.anchor_x - measurements.gutter_width)
-                    .child(self.render_prompt_editor(cx)),
-            )
+            .child(h_flex().flex_1().child(self.render_prompt_editor(cx)))
     }
 }
 
@@ -3653,8 +3647,8 @@ impl InlineAssistant {
 // This wouldn't need to exist if we could pass parameters when rendering child views.
 #[derive(Copy, Clone, Default)]
 struct BlockMeasurements {
-    anchor_x: Pixels,
     gutter_width: Pixels,
+    gutter_margin: Pixels,
 }
 
 struct PendingInlineAssist {