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

Menubar: trigger leaf nodes on mouse release

Browse Source 
Feels more natural
This commit is contained in:
Alexandre Bury 2018-01-09 14:53:55 +01:00
parent d384cbdaf1
commit d41f1e937d
2 changed files with 32 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/menu.rs
View File

@ -56,6 +56,14 @@ impl MenuItem {
}
}
/// Returns `true` if `self` is a leaf node.
pub fn is_leaf(&self) -> bool {
match *self {
MenuItem::Leaf(_, _) => true,
_ => false,
}
}
/// Returns `true` if `self` is a subtree.
pub fn is_subtree(&self) -> bool {
match *self {

27
src/views/menubar.rs
View File

@ -323,9 +323,30 @@ impl View for Menubar {
.checked_sub(offset)
.and_then(|pos| self.child_at(pos.x))
{
self.focus = child;
if btn == MouseButton::Left {
return self.select_child(false);
if !self.root.children[child].is_delimiter() {
self.focus = child;
if btn == MouseButton::Left {
return self.select_child(true);
}
}
}
}
Event::Mouse {
event: MouseEvent::Release(btn),
position,
offset,
} if position.fits(offset) && position.y == offset.y =>
{
if let Some(child) = position
.checked_sub(offset)
.and_then(|pos| self.child_at(pos.x))
{
if self.root.children[child].is_leaf() {
if self.focus == child {
if btn == MouseButton::Left {
return self.select_child(false);
}
}
}
}
}