WIP

Antonio Scandurra created 2 years ago

Change summary

crates/ai/src/refactoring_modal.rs |  7 +++++--
crates/theme/src/theme.rs          |  2 --
styles/src/style_tree/assistant.ts | 13 +++++--------
3 files changed, 10 insertions(+), 12 deletions(-)

Detailed changes

crates/ai/src/refactoring_modal.rs

@@ -40,7 +40,12 @@ impl View for RefactoringModal {
     }
 
     fn render(&mut self, cx: &mut ViewContext<Self>) -> AnyElement<Self> {
+        let theme = theme::current(cx);
         ChildView::new(&self.prompt_editor, cx)
+            .aligned()
+            .left()
+            .contained()
+            .with_style(theme.assistant.modal.container)
             .mouse::<Self>(0)
             .on_click_out(MouseButton::Left, |_, _, cx| cx.emit(Event::Dismissed))
             .on_click_out(MouseButton::Right, |_, _, cx| cx.emit(Event::Dismissed))
@@ -93,8 +98,6 @@ impl RefactoringModal {
                                 ChildView::new(&refactoring, cx)
                                     .contained()
                                     .with_padding_left(cx.gutter_width)
-                                    .aligned()
-                                    .left()
                                     .into_any()
                             }
                         }),

crates/theme/src/theme.rs

@@ -1131,8 +1131,6 @@ pub struct AssistantStyle {
 pub struct ModalAssistantStyle {
     #[serde(flatten)]
     pub container: ContainerStyle,
-    pub width: f32,
-    pub editor_max_lines: usize,
     pub editor: FieldEditor,
 }
 

styles/src/style_tree/assistant.ts

@@ -60,14 +60,11 @@ export default function assistant(): any {
             padding: { left: 12 },
         },
         modal: {
-            background: background(theme.lowest),
-            border: border(theme.lowest),
-            shadow: theme.modal_shadow,
-            corner_radius: 12,
-            padding: { left: 12, right: 0, top: 12, bottom: 12 },
-            margin: { right: 12 },
-            width: 500,
-            editor_max_lines: 6,
+            border: border(theme.lowest, "on", {
+                top: true,
+                bottom: true,
+                overlay: true,
+            }),
             editor: {
                 text: text(theme.lowest, "mono", "on", { size: "sm" }),
                 placeholder_text: text(theme.lowest, "sans", "on", "disabled"),