djkato/egui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TextEdit: paint cursor on top of text

Browse source 
This is so that we see the cursor even when the text galley has
background colors, like `code` section in easymark do.
This commit is contained in:
Emil Ernerfeldt 2021-09-05 18:59:35 +02:00
parent f9afdfa143
commit 5592124ad5
1 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
egui/src/widgets/text_edit.rs
View file

@ -811,8 +811,22 @@ impl<'t, S: TextBuffer> TextEdit<'t, S> {
text_draw_pos -= vec2(offset_x, 0.0); text_draw_pos -= vec2(offset_x, 0.0);
} }
painter.galley(text_draw_pos, galley.clone());
if text.as_ref().is_empty() && !hint_text.is_empty() {
let hint_text_color = ui.visuals().weak_text_color();
let galley = ui.fonts().layout_job(if multiline {
LayoutJob::simple(hint_text, text_style, hint_text_color, desired_size.x)
} else {
LayoutJob::simple_singleline(hint_text, text_style, hint_text_color)
});
painter.galley(response.rect.min, galley);
}
if ui.memory().has_focus(id) { if ui.memory().has_focus(id) {
if let Some(cursorp) = state.cursorp { if let Some(cursorp) = state.cursorp {
// We paint the cursor on top of the text, in case
// the text galley has backgrounds (as e.g. `code` snippets in markup do).
paint_cursor_selection(ui, &painter, text_draw_pos, &galley, &cursorp); paint_cursor_selection(ui, &painter, text_draw_pos, &galley, &cursorp);
paint_cursor_end( paint_cursor_end(
ui, ui,
@ -834,17 +848,6 @@ impl<'t, S: TextBuffer> TextEdit<'t, S> {
} }
} }
painter.galley(text_draw_pos, galley);
if text.as_ref().is_empty() && !hint_text.is_empty() {
let hint_text_color = ui.visuals().weak_text_color();
let galley = ui.fonts().layout_job(if multiline {
LayoutJob::simple(hint_text, text_style, hint_text_color, desired_size.x)
} else {
LayoutJob::simple_singleline(hint_text, text_style, hint_text_color)
});
painter.galley(response.rect.min, galley);
}
ui.memory().id_data.insert(id, state); ui.memory().id_data.insert(id, state);
let selection_changed = if let (Some(text_cursor), Some(prev_text_cursor)) = let selection_changed = if let (Some(text_cursor), Some(prev_text_cursor)) =
@ -897,10 +900,12 @@ fn paint_cursor_selection(
galley: &Galley, galley: &Galley,
cursorp: &CursorPair, cursorp: &CursorPair,
) { ) {
let color = ui.visuals().selection.bg_fill;
if cursorp.is_empty() { if cursorp.is_empty() {
return; return;
} }
// We paint the cursor selection on top of the text, so make it transparent:
let color = ui.visuals().selection.bg_fill.linear_multiply(0.5);
let [min, max] = cursorp.sorted(); let [min, max] = cursorp.sorted();
let min = min.rcursor; let min = min.rcursor;
let max = max.rcursor; let max = max.rcursor;