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

Fix ScrollView offset after change of focus

Browse Source
This commit is contained in:
Alexandre Bury 2020-01-14 09:56:03 -08:00
parent d499bab941
commit 13a63684f2
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/views/scroll_view.rs
View File

@ -210,15 +210,25 @@ where
} }
fn call_on_any<'a>(&mut self, selector: &Selector<'_>, cb: AnyCb<'a>) { fn call_on_any<'a>(&mut self, selector: &Selector<'_>, cb: AnyCb<'a>) {
// TODO: should we scroll_to_important_area here?
// The callback may change the focus or some other thing.
self.inner.call_on_any(selector, cb) self.inner.call_on_any(selector, cb)
} }
fn focus_view(&mut self, selector: &Selector<'_>) -> Result<(), ()> { fn focus_view(&mut self, selector: &Selector<'_>) -> Result<(), ()> {
self.inner.focus_view(selector) self.inner.focus_view(selector).map(|()| {
self.scroll_to_important_area();
})
} }
fn take_focus(&mut self, source: Direction) -> bool { fn take_focus(&mut self, source: Direction) -> bool {
self.inner.take_focus(source) || self.core.is_scrolling().any() // If the inner view takes focus, re-align the important area.
if self.inner.take_focus(source) {
self.scroll_to_important_area();
true
} else {
self.core.is_scrolling().any()
}
} }
fn important_area(&self, size: Vec2) -> Rect { fn important_area(&self, size: Vec2) -> Rect {