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

Start on completions styles

Browse source
This commit is contained in:
Nate Butler 2023-11-27 10:29:29 -05:00
parent cd4ea344a6
commit 1acc6b462f
3 changed files with 21 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

22
crates/editor2/src/editor.rs
View file

@ -1273,6 +1273,13 @@ impl CompletionsMenu {
multiline_docs.map(|div| { multiline_docs.map(|div| {
div.id("multiline_docs") div.id("multiline_docs")
.max_h(max_height) .max_h(max_height)
.flex_1()
.px_1p5()
.py_1()
.min_w(px(260.))
.max_w(px(640.))
.w(px(500.))
.text_ui()
.overflow_y_scroll() .overflow_y_scroll()
// Prevent a mouse down on documentation from being propagated to the editor, // Prevent a mouse down on documentation from being propagated to the editor,
// because that would move the cursor. // because that would move the cursor.
@ -1327,13 +1334,18 @@ impl CompletionsMenu {
div() div()
.id(mat.candidate_id) .id(mat.candidate_id)
.min_w(px(300.)) .min_w(px(220.))
.max_w(px(700.)) .max_w(px(640.))
.whitespace_nowrap() .whitespace_nowrap()
.overflow_hidden() .overflow_hidden()
.bg(gpui::green()) .text_ui()
.hover(|style| style.bg(gpui::blue())) .px_1()
.when(item_ix == selected_item, |div| div.bg(gpui::red())) .rounded(px(4.))
.bg(cx.theme().colors().ghost_element_background)
.hover(|style| style.bg(cx.theme().colors().ghost_element_hover))
.when(item_ix == selected_item, |div| {
div.bg(cx.theme().colors().ghost_element_selected)
})
.on_mouse_down( .on_mouse_down(
MouseButton::Left, MouseButton::Left,
cx.listener(move |editor, event, cx| { cx.listener(move |editor, event, cx| {

2
crates/ui2/src/components/popover.rs
View file

@ -3,6 +3,7 @@ use gpui::{
WindowContext, WindowContext,
}; };
use smallvec::SmallVec; use smallvec::SmallVec;
use theme2::ActiveTheme;
use crate::{v_stack, StyledExt}; use crate::{v_stack, StyledExt};
@ -58,6 +59,7 @@ impl RenderOnce for Popover {
.ml_1() .ml_1()
.absolute() .absolute()
.elevation_2(cx) .elevation_2(cx)
.bg(cx.theme().colors().surface_background)
.p_1() .p_1()
.child(aside), .child(aside),
) )

4
crates/ui2/src/styled_ext.rs
View file

@ -1,4 +1,4 @@
use gpui::{Styled, WindowContext}; use gpui::{px, Styled, WindowContext};
use theme2::ActiveTheme; use theme2::ActiveTheme;
use crate::{ElevationIndex, UITextSize}; use crate::{ElevationIndex, UITextSize};
@ -6,7 +6,7 @@ use crate::{ElevationIndex, UITextSize};
fn elevated<E: Styled>(this: E, cx: &mut WindowContext, index: ElevationIndex) -> E { fn elevated<E: Styled>(this: E, cx: &mut WindowContext, index: ElevationIndex) -> E {
this.bg(cx.theme().colors().elevated_surface_background) this.bg(cx.theme().colors().elevated_surface_background)
.z_index(index.z_index()) .z_index(index.z_index())
.rounded_lg() .rounded(px(8.))
.border() .border()
.border_color(cx.theme().colors().border_variant) .border_color(cx.theme().colors().border_variant)
.shadow(index.shadow()) .shadow(index.shadow())