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

Move prev_text off of the widget struct.

Browse source
This commit is contained in:
Nolan Darilek 2021-05-19 06:18:05 -05:00
parent 73271a6265
commit fa18727933
1 changed files with 1 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,6 @@ impl CCursorPair {
#[derive(Debug)] #[derive(Debug)]
pub struct TextEdit<'t> { pub struct TextEdit<'t> {
text: &'t mut String, text: &'t mut String,
prev_text: String,
hint_text: String, hint_text: String,
id: Option<Id>, id: Option<Id>,
id_source: Option<Id>, id_source: Option<Id>,
@ -171,7 +170,6 @@ impl<'t> TextEdit<'t> {
pub fn singleline(text: &'t mut String) -> Self { pub fn singleline(text: &'t mut String) -> Self {
TextEdit { TextEdit {
text, text,
prev_text: Default::default(),
hint_text: Default::default(), hint_text: Default::default(),
id: None, id: None,
id_source: None, id_source: None,
@ -191,7 +189,6 @@ impl<'t> TextEdit<'t> {
pub fn multiline(text: &'t mut String) -> Self { pub fn multiline(text: &'t mut String) -> Self {
TextEdit { TextEdit {
text, text,
prev_text: Default::default(),
hint_text: Default::default(), hint_text: Default::default(),
id: None, id: None,
id_source: None, id_source: None,
@ -334,7 +331,6 @@ impl<'t> Widget for TextEdit<'t> {
impl<'t> TextEdit<'t> { impl<'t> TextEdit<'t> {
fn content_ui(self, ui: &mut Ui) -> Response { fn content_ui(self, ui: &mut Ui) -> Response {
let TextEdit { let TextEdit {
mut prev_text,
text, text,
hint_text, hint_text,
id, id,
@ -350,6 +346,7 @@ impl<'t> TextEdit<'t> {
lock_focus, lock_focus,
} = self; } = self;
let mut prev_text = text.clone();
let text_style = text_style.unwrap_or_else(|| ui.style().body_text_style); let text_style = text_style.unwrap_or_else(|| ui.style().body_text_style);
let line_spacing = ui.fonts().row_height(text_style); let line_spacing = ui.fonts().row_height(text_style);
let available_width = ui.available_width(); let available_width = ui.available_width();
@ -556,7 +553,6 @@ impl<'t> TextEdit<'t> {
if let Some((undo_ccursorp, undo_txt)) = if let Some((undo_ccursorp, undo_txt)) =
state.undoer.undo(&(cursorp.as_ccursorp(), text.clone())) state.undoer.undo(&(cursorp.as_ccursorp(), text.clone()))
{ {
prev_text = text.clone();
*text = undo_txt.clone(); *text = undo_txt.clone();
Some(*undo_ccursorp) Some(*undo_ccursorp)
} else { } else {