Skip to content

Commit 889cc21

Browse files
committed
completion: wire up font.line_height
1 parent afa9806 commit 889cc21

File tree

1 file changed

+30
-9
lines changed

1 file changed

+30
-9
lines changed

src/buffer/input_view/completion.rs

Lines changed: 30 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -938,7 +938,8 @@ impl Commands {
938938
column(entries.iter().map(|(index, command)| {
939939
let selected = Some(*index) == *highlighted;
940940
let content =
941-
text(format!("/{}", command.title.to_lowercase()));
941+
text(format!("/{}", command.title.to_lowercase()))
942+
.line_height(theme::line_height(&config.font));
942943

943944
Element::from(
944945
container(content)
@@ -970,7 +971,12 @@ impl Commands {
970971
subcommand,
971972
} => {
972973
if config.buffer.commands.show_description {
973-
Some(command.view(input, subcommand.as_ref(), theme))
974+
Some(command.view(
975+
input,
976+
subcommand.as_ref(),
977+
config,
978+
theme,
979+
))
974980
} else {
975981
None
976982
}
@@ -1077,6 +1083,7 @@ impl Command {
10771083
&self,
10781084
input: &str,
10791085
subcommand: Option<&Command>,
1086+
config: &Config,
10801087
theme: &'a Theme,
10811088
) -> Element<'a, Message> {
10821089
let command_prefix = format!("/{}", self.title.to_lowercase());
@@ -1110,10 +1117,13 @@ impl Command {
11101117
.saturating_sub(1),
11111118
);
11121119

1113-
let title = Some(Element::from(text(self.title)));
1120+
let title = Some(Element::from(
1121+
text(self.title).line_height(theme::line_height(&config.font)),
1122+
));
11141123

11151124
let arg_text = |index: usize, arg: &Argument| {
11161125
let content = text(format!("{arg}"))
1126+
.line_height(theme::line_height(&config.font))
11171127
.style(move |theme| {
11181128
if index == active_arg {
11191129
theme::text::tertiary(theme)
@@ -1129,6 +1139,7 @@ impl Command {
11291139

11301140
if let Some(arg_tooltip) = &arg.tooltip {
11311141
let tooltip_indicator = text("*")
1142+
.line_height(theme::line_height(&config.font))
11321143
.style(move |theme| {
11331144
if index == active_arg {
11341145
theme::text::tertiary(theme)
@@ -1144,12 +1155,13 @@ impl Command {
11441155
.size(8);
11451156

11461157
Element::from(row![
1147-
text(" "),
1158+
text(" ").line_height(theme::line_height(&config.font)),
11481159
tooltip(
11491160
row![content, tooltip_indicator]
11501161
.align_y(iced::Alignment::Start),
11511162
container(
11521163
text(arg_tooltip.clone())
1164+
.line_height(theme::line_height(&config.font))
11531165
.style(move |theme| {
11541166
if index == active_arg {
11551167
theme::text::tertiary(theme)
@@ -1172,7 +1184,10 @@ impl Command {
11721184
.delay(iced::time::Duration::ZERO)
11731185
])
11741186
} else {
1175-
Element::from(row![text(" "), content])
1187+
Element::from(row![
1188+
text(" ").line_height(theme::line_height(&config.font)),
1189+
content
1190+
])
11761191
}
11771192
};
11781193

@@ -1211,7 +1226,9 @@ impl Command {
12111226

12121227
Either::Right(if self.subcommands.is_some() {
12131228
Either::Left(args.chain(iter::once(Element::from(row![
1214-
text(" ...").style(theme::text::none)
1229+
text(" ...")
1230+
.line_height(theme::line_height(&config.font))
1231+
.style(theme::text::none)
12151232
]))))
12161233
} else {
12171234
Either::Right(args)
@@ -1224,9 +1241,12 @@ impl Command {
12241241
subcommand.description()
12251242
})
12261243
.map(|description| {
1227-
text(description).style(theme::text::secondary).font_maybe(
1228-
theme::font_style::secondary(theme).map(font::get),
1229-
)
1244+
text(description)
1245+
.line_height(theme::line_height(&config.font))
1246+
.style(theme::text::secondary)
1247+
.font_maybe(
1248+
theme::font_style::secondary(theme).map(font::get),
1249+
)
12301250
}),
12311251
row(title.into_iter().chain(args)),
12321252
])
@@ -2667,6 +2687,7 @@ impl Emojis {
26672687
.unwrap_or(" "),
26682688
shortcode
26692689
))
2690+
.line_height(theme::line_height(&config.font))
26702691
.shaping(text::Shaping::Advanced);
26712692

26722693
Element::from(

0 commit comments

Comments
 (0)