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

Include padding and borders in Dialog event relativization

Browse Source
This commit is contained in:
Alexandre Bury 2017-10-11 15:13:10 -07:00
parent 2932b9de50
commit a6fb0e71cd
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/views/dialog.rs
View File

@ -205,7 +205,9 @@ impl Dialog {
// An event is received while the content is in focus // An event is received while the content is in focus
fn on_event_content(&mut self, event: Event) -> EventResult { fn on_event_content(&mut self, event: Event) -> EventResult {
match self.content.on_event(event.relativized((1, 1))) { match self.content.on_event(
event.relativized((self.padding + self.borders).top_left()),
) {
EventResult::Ignored if !self.buttons.is_empty() => { EventResult::Ignored if !self.buttons.is_empty() => {
match event { match event {
Event::Key(Key::Down) | Event::Key(Key::Down) |
@ -383,7 +385,10 @@ impl Dialog {
position.fits_in_rect(btn.offset.get(), btn.button.size) position.fits_in_rect(btn.offset.get(), btn.button.size)
}) { }) {
self.focus = Focus::Button(i); self.focus = Focus::Button(i);
} else if position.fits_in_rect((1, 1), self.content.size) } else if position.fits_in_rect(
(self.padding + self.borders).top_left(),
self.content.size,
)
&& self.content.take_focus(Direction::none()) && self.content.take_focus(Direction::none())
{ {
// Or did we click the content? // Or did we click the content?