|
@@ -133,7 +133,8 @@ impl Editor {
|
|
|
assert!(cursor_idx <= self.state.text.len());
|
|
assert!(cursor_idx <= self.state.text.len());
|
|
|
assert_eq!(self.state.text, self.text.get());
|
|
assert_eq!(self.state.text, self.text.get());
|
|
|
self.state.select = (cursor_idx, cursor_idx);
|
|
self.state.select = (cursor_idx, cursor_idx);
|
|
|
- self.input.set_select(cursor_idx, cursor_idx);
|
|
|
|
|
|
|
+ self.state.compose = None;
|
|
|
|
|
+ self.input.set_state(self.state.clone());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
pub fn select_word_at_point(&mut self, pos: Point) {
|
|
pub fn select_word_at_point(&mut self, pos: Point) {
|
|
@@ -216,13 +217,15 @@ impl Editor {
|
|
|
assert!(select_end <= self.state.text.len());
|
|
assert!(select_end <= self.state.text.len());
|
|
|
assert_eq!(self.state.text, self.text.get());
|
|
assert_eq!(self.state.text, self.text.get());
|
|
|
self.state.select = (select_start, select_end);
|
|
self.state.select = (select_start, select_end);
|
|
|
- self.input.set_select(select_start, select_end);
|
|
|
|
|
|
|
+ self.state.compose = None;
|
|
|
|
|
+ self.input.set_state(self.state.clone());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
pub fn select_all(&mut self) {
|
|
pub fn select_all(&mut self) {
|
|
|
let text_len = self.state.text.len();
|
|
let text_len = self.state.text.len();
|
|
|
self.state.select = (0, text_len);
|
|
self.state.select = (0, text_len);
|
|
|
- self.input.set_select(0, text_len);
|
|
|
|
|
|
|
+ self.state.compose = None;
|
|
|
|
|
+ self.input.set_state(self.state.clone());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
#[allow(dead_code)]
|
|
#[allow(dead_code)]
|