arnekeller/cursive
1
0
Fork 0
mirror of https://github.com/FliegendeWurst/cursive.git synced 2024-11-23 17:35:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix SelectView mouse handling

Browse Source
This commit is contained in:
Alexandre Bury 2017-10-12 16:42:17 -07:00
parent 75d5868162
commit 394e61a328
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/select_view.rs
View File

@ -386,7 +386,7 @@ impl<T: 'static> SelectView<T> {
position, position,
offset, offset,
} => if let Some(position) = position.checked_sub(offset) { } => if let Some(position) = position.checked_sub(offset) {
if position.fits_in(self.last_size) { if position < self.last_size {
fix_scroll = false; fix_scroll = false;
self.focus.set(position.y + self.scrollbase.start_line); self.focus.set(position.y + self.scrollbase.start_line);
} }
@ -400,7 +400,7 @@ impl<T: 'static> SelectView<T> {
self.scrollbase.release_grab(); self.scrollbase.release_grab();
if self.on_submit.is_some() { if self.on_submit.is_some() {
if let Some(position) = position.checked_sub(offset) { if let Some(position) = position.checked_sub(offset) {
if position.fits_in(self.last_size) { if position < self.last_size {
if position.y + self.scrollbase.start_line if position.y + self.scrollbase.start_line
== self.focus() == self.focus()
{ {
@ -476,7 +476,8 @@ impl<T: 'static> SelectView<T> {
let offset = offset + (text_offset, 0); let offset = offset + (text_offset, 0);
let offset = offset.saturating_sub((0, focus)); let offset = offset.saturating_sub((0, focus));
let offset = offset.saturating_sub((2, 1)); let offset = offset.saturating_sub((2, 1));
// And now, we can return the callback.
// And now, we can return the callback that will create the popup.
EventResult::with_cb(move |s| { EventResult::with_cb(move |s| {
// The callback will want to work with a fresh Rc // The callback will want to work with a fresh Rc
let tree = tree.clone(); let tree = tree.clone();
@ -500,7 +501,7 @@ impl<T: 'static> SelectView<T> {
// TODO: add Left/Right support for quick-switch? // TODO: add Left/Right support for quick-switch?
Event::Key(Key::Enter) => self.open_popup(), Event::Key(Key::Enter) => self.open_popup(),
Event::Mouse { Event::Mouse {
event: MouseEvent::Press(MouseButton::Left), event: MouseEvent::Release(MouseButton::Left),
position, position,
offset, offset,
} if position.fits_in_rect(offset, self.last_size) => } if position.fits_in_rect(offset, self.last_size) =>