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

Remove unused cursor_blink_hz

Browse source
This commit is contained in:
Emil Ernerfeldt 2020-11-14 22:38:55 +01:00
parent c4ed507d63
commit 220f48a159
2 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
egui/src/style.rs
View file

@ -131,8 +131,6 @@ pub struct Visuals {
pub resize_corner_size: f32, pub resize_corner_size: f32,
/// Blink text cursor by this frequency. If 0, always show the cursor.
pub cursor_blink_hz: f32,
pub text_cursor_width: f32, pub text_cursor_width: f32,
/// Allow child widgets to be just on the border and still have a stroke with some thickness /// Allow child widgets to be just on the border and still have a stroke with some thickness
@ -260,7 +258,6 @@ impl Default for Visuals {
dark_bg_color: Srgba::black_alpha(140), dark_bg_color: Srgba::black_alpha(140),
window_corner_radius: 10.0, window_corner_radius: 10.0,
resize_corner_size: 12.0, resize_corner_size: 12.0,
cursor_blink_hz: 0.0, // 1.0 looks good
text_cursor_width: 2.0, text_cursor_width: 2.0,
clip_rect_margin: 3.0, clip_rect_margin: 3.0,
debug_widget_rects: false, debug_widget_rects: false,
@ -444,7 +441,6 @@ impl Visuals {
dark_bg_color, dark_bg_color,
window_corner_radius, window_corner_radius,
resize_corner_size, resize_corner_size,
cursor_blink_hz,
text_cursor_width, text_cursor_width,
clip_rect_margin, clip_rect_margin,
debug_widget_rects, debug_widget_rects,
@ -455,7 +451,6 @@ impl Visuals {
ui_color(ui, dark_bg_color, "dark_bg_color"); ui_color(ui, dark_bg_color, "dark_bg_color");
ui.add(Slider::f32(window_corner_radius, 0.0..=20.0).text("window_corner_radius")); ui.add(Slider::f32(window_corner_radius, 0.0..=20.0).text("window_corner_radius"));
ui.add(Slider::f32(resize_corner_size, 0.0..=20.0).text("resize_corner_size")); ui.add(Slider::f32(resize_corner_size, 0.0..=20.0).text("resize_corner_size"));
ui.add(Slider::f32(cursor_blink_hz, 0.0..=4.0).text("cursor_blink_hz"));
ui.add(Slider::f32(text_cursor_width, 0.0..=2.0).text("text_cursor_width")); ui.add(Slider::f32(text_cursor_width, 0.0..=2.0).text("text_cursor_width"));
ui.add(Slider::f32(clip_rect_margin, 0.0..=20.0).text("clip_rect_margin")); ui.add(Slider::f32(clip_rect_margin, 0.0..=20.0).text("clip_rect_margin"));

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

@ -287,22 +287,12 @@ impl<'t> Widget for TextEdit<'t> {
} }
if ui.memory().has_kb_focus(id) { if ui.memory().has_kb_focus(id) {
let cursor_blink_hz = ui.style().visuals.cursor_blink_hz; if let Some(pcursor) = state.pcursor {
let show_cursor = if 0.0 < cursor_blink_hz { let cursor_pos = response.rect.min + galley.pos_from_pcursor(pcursor);
ui.ctx().request_repaint(); // TODO: only when cursor blinks on or off painter.line_segment(
(ui.input().time * cursor_blink_hz as f64 * 3.0).floor() as i64 % 3 != 0 [cursor_pos, cursor_pos + vec2(0.0, line_spacing)],
} else { (ui.style().visuals.text_cursor_width, color::WHITE),
true );
};
if show_cursor {
if let Some(pcursor) = state.pcursor {
let cursor_pos = response.rect.min + galley.pos_from_pcursor(pcursor);
painter.line_segment(
[cursor_pos, cursor_pos + vec2(0.0, line_spacing)],
(ui.style().visuals.text_cursor_width, color::WHITE),
);
}
} }
} }