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

Improve the "go to line" modal (#21301)

Browse source 
Just a small, mostly visual refinement to this component.

<img width="700" alt="Screenshot 2024-11-28 at 16 30 27"
src="https://github.com/user-attachments/assets/d5bbed63-202c-4cd3-b4b0-b7ed23466309">

Release Notes:

- N/A
This commit is contained in:
Danilo Leal 2024-11-28 18:28:05 -03:00 • committed by GitHub
parent ae85ecba2d
commit e76589107d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 18 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

31
crates/go_to_line/src/go_to_line.rs
View file

@ -9,7 +9,7 @@ use gpui::{
use settings::Settings; use settings::Settings;
use text::{Bias, Point}; use text::{Bias, Point};
use theme::ActiveTheme; use theme::ActiveTheme;
use ui::{h_flex, prelude::*, v_flex, Label}; use ui::prelude::*;
use util::paths::FILE_ROW_COLUMN_DELIMITER; use util::paths::FILE_ROW_COLUMN_DELIMITER;
use workspace::ModalView; use workspace::ModalView;
@ -73,7 +73,7 @@ impl GoToLine {
let last_line = editor.buffer().read(cx).snapshot(cx).max_point().row; let last_line = editor.buffer().read(cx).snapshot(cx).max_point().row;
let scroll_position = active_editor.update(cx, |editor, cx| editor.scroll_position(cx)); let scroll_position = active_editor.update(cx, |editor, cx| editor.scroll_position(cx));
let current_text = format!("line {} of {} (column {})", line, last_line + 1, column); let current_text = format!("{} of {} (column {})", line, last_line + 1, column);
Self { Self {
line_editor, line_editor,
@ -186,36 +186,27 @@ impl Render for GoToLine {
} }
} }
div() v_flex()
.w(rems(24.))
.elevation_2(cx) .elevation_2(cx)
.key_context("GoToLine") .key_context("GoToLine")
.on_action(cx.listener(Self::cancel)) .on_action(cx.listener(Self::cancel))
.on_action(cx.listener(Self::confirm)) .on_action(cx.listener(Self::confirm))
.w_96()
.child(
v_flex()
.px_1()
.pt_0p5()
.gap_px()
.child(
v_flex()
.py_0p5()
.px_1()
.child(div().px_1().py_0p5().child(self.line_editor.clone())),
)
.child( .child(
div() div()
.h_px() .border_b_1()
.w_full() .border_color(cx.theme().colors().border_variant)
.bg(cx.theme().colors().element_background), .px_2()
.py_1()
.child(self.line_editor.clone()),
) )
.child( .child(
h_flex() h_flex()
.justify_between()
.px_2() .px_2()
.py_1() .py_1()
.gap_1()
.child(Label::new("Current Line:").color(Color::Muted))
.child(Label::new(help_text).color(Color::Muted)), .child(Label::new(help_text).color(Color::Muted)),
),
) )
} }
} }