edit prediction: Refine subtle mode flag styles (#25157)
There's still a tiny, 1px shadow being cast in the flag pole that I didn't figure out yet how to fix it. https://github.com/user-attachments/assets/714da320-5995-4bd2-a0dc-6c027b4d91eb Release Notes: - N/A
This commit is contained in:
parent
044be72038
commit
f8770fee10
2 changed files with 16 additions and 11 deletions
|
@ -5901,20 +5901,18 @@ impl Editor {
|
||||||
window: &mut Window,
|
window: &mut Window,
|
||||||
cx: &App,
|
cx: &App,
|
||||||
) -> Option<Div> {
|
) -> Option<Div> {
|
||||||
let bg_color = Self::edit_prediction_line_popover_bg_color(cx);
|
|
||||||
|
|
||||||
let padding_right = if icon.is_some() { px(4.) } else { px(8.) };
|
let padding_right = if icon.is_some() { px(4.) } else { px(8.) };
|
||||||
|
|
||||||
let result = h_flex()
|
let result = h_flex()
|
||||||
.gap_1()
|
|
||||||
.border_1()
|
|
||||||
.rounded_lg()
|
|
||||||
.shadow_sm()
|
|
||||||
.bg(bg_color)
|
|
||||||
.border_color(cx.theme().colors().text_accent.opacity(0.4))
|
|
||||||
.py_0p5()
|
.py_0p5()
|
||||||
.pl_1()
|
.pl_1()
|
||||||
.pr(padding_right)
|
.pr(padding_right)
|
||||||
|
.gap_1()
|
||||||
|
.rounded(px(6.))
|
||||||
|
.border_1()
|
||||||
|
.bg(Self::edit_prediction_line_popover_bg_color(cx))
|
||||||
|
.border_color(Self::edit_prediction_callout_popover_border_color(cx))
|
||||||
|
.shadow_sm()
|
||||||
.children(self.render_edit_prediction_accept_keybind(window, cx))
|
.children(self.render_edit_prediction_accept_keybind(window, cx))
|
||||||
.child(Label::new(label).size(LabelSize::Small))
|
.child(Label::new(label).size(LabelSize::Small))
|
||||||
.when_some(icon, |element, icon| {
|
.when_some(icon, |element, icon| {
|
||||||
|
@ -5934,6 +5932,12 @@ impl Editor {
|
||||||
editor_bg_color.blend(accent_color.opacity(0.1))
|
editor_bg_color.blend(accent_color.opacity(0.1))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn edit_prediction_callout_popover_border_color(cx: &App) -> Hsla {
|
||||||
|
let accent_color = cx.theme().colors().text_accent;
|
||||||
|
let editor_bg_color = cx.theme().colors().editor_background;
|
||||||
|
editor_bg_color.blend(accent_color.opacity(0.6))
|
||||||
|
}
|
||||||
|
|
||||||
fn render_edit_prediction_cursor_popover(
|
fn render_edit_prediction_cursor_popover(
|
||||||
&self,
|
&self,
|
||||||
min_width: Pixels,
|
min_width: Pixels,
|
||||||
|
@ -6006,10 +6010,11 @@ impl Editor {
|
||||||
h_flex()
|
h_flex()
|
||||||
.px_2()
|
.px_2()
|
||||||
.py_1()
|
.py_1()
|
||||||
|
.gap_2()
|
||||||
.elevation_2(cx)
|
.elevation_2(cx)
|
||||||
.border_color(cx.theme().colors().border)
|
.border_color(cx.theme().colors().border)
|
||||||
|
.rounded(px(6.))
|
||||||
.rounded_tl(px(0.))
|
.rounded_tl(px(0.))
|
||||||
.gap_2()
|
|
||||||
.child(
|
.child(
|
||||||
if target.text_anchor.to_point(&snapshot).row > cursor_point.row {
|
if target.text_anchor.to_point(&snapshot).row > cursor_point.row {
|
||||||
Icon::new(IconName::ZedPredictDown)
|
Icon::new(IconName::ZedPredictDown)
|
||||||
|
|
|
@ -3628,6 +3628,7 @@ impl EditorElement {
|
||||||
const POLE_WIDTH: Pixels = px(2.);
|
const POLE_WIDTH: Pixels = px(2.);
|
||||||
|
|
||||||
let mut element = v_flex()
|
let mut element = v_flex()
|
||||||
|
.items_end()
|
||||||
.child(
|
.child(
|
||||||
editor
|
editor
|
||||||
.render_edit_prediction_line_popover("Jump", None, window, cx)?
|
.render_edit_prediction_line_popover("Jump", None, window, cx)?
|
||||||
|
@ -3638,10 +3639,9 @@ impl EditorElement {
|
||||||
.child(
|
.child(
|
||||||
div()
|
div()
|
||||||
.w(POLE_WIDTH)
|
.w(POLE_WIDTH)
|
||||||
.bg(cx.theme().colors().text_accent.opacity(0.8))
|
.bg(Editor::edit_prediction_callout_popover_border_color(cx))
|
||||||
.h(line_height),
|
.h(line_height),
|
||||||
)
|
)
|
||||||
.items_end()
|
|
||||||
.into_any();
|
.into_any();
|
||||||
|
|
||||||
let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
|
let size = element.layout_as_root(AvailableSpace::min_size(), window, cx);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue