Fixed issue 17 #803
Fixed issue 17 #803
Conversation
cursive-core/src/views/dialog.rs
Outdated
| Some(y) => y, | ||
| None => return None, | ||
| }; | ||
| match self.vertical_button_orientation { |
There was a problem hiding this comment.
I believe a shared implementation is possible, rather than two entirely separate branches.
There was a problem hiding this comment.
I remade the draw_buttons implementation using the Vec2::from_major_minor method.
cursive-core/src/views/dialog.rs
Outdated
| .cropped(inner_size) | ||
| .focused(self.focus == DialogFocus::Content), | ||
| ); | ||
| match self.vertical_button_orientation { |
There was a problem hiding this comment.
Here too we should be able to share the implementation.
Either directly take buttons_size as a Vec2 in the function, or:
let buttons_size = Vec2::from_major_minor(self.buttons_orientation, buttons_size, 0)`Then you can do
let taken = buttons_size + self.borders.combined() + self.padding.combined();And continue with the shared logic.
There was a problem hiding this comment.
I managed to turn it into a single implementation with the advice you provided.
cursive-core/src/views/dialog.rs
Outdated
| Some(height) => height, | ||
| None => return, | ||
| }; | ||
| match self.vertical_button_orientation { |
There was a problem hiding this comment.
Same here, we should be able to abstract over the orientation and have a single implementation.
There was a problem hiding this comment.
I remade the draw implementation. It has a single branch now, with some additional steps if the orientation is vertical.
cursive-core/src/views/dialog.rs
Outdated
| @@ -555,15 +565,26 @@ impl Dialog { | |||
| match result { | |||
| EventResult::Ignored => { | |||
| match event { | |||
There was a problem hiding this comment.
You could match (event, self.button_orientation) {, then match on (Event::Key(Key::Up), Orientation::Horizontal), which could be easier than adding if self.button_orientation == ... every time.
Added a new parameter for the Dialog structure to enable vertical orientation of the buttons and modified the draw methods accordingly.