Skip to content

Commit

Permalink
Merge pull request #280 from captchaKing/fix-menubar-behaviour
Browse files Browse the repository at this point in the history 
Fix MenuBar behaviour
  • Loading branch information
@dhardy
dhardy committed Feb 13, 2022
2 parents 7893bb2 + b49b263 commit 5afee82
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 45 deletions.
81 changes: 37 additions & 44 deletions crates/kas-widgets/src/menu/menubar.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ widget! {
core: CoreData,
#[widget]
pub bar: IndexedList<D, SubMenu<D::Flipped, W>>,
// Open mode. Used to close with click on root only when previously open.
opening: bool,
delayed_open: Option<WidgetId>,
}

Expand All @@ -49,7 +47,6 @@ widget! {
MenuBar {
core: Default::default(),
bar: IndexedList::new_with_direction(direction, menus),
opening: false,
delayed_open: None,
}
}
Expand All @@ -75,28 +72,29 @@ widget! {
} => {
if start_id.as_ref().map(|id| self.is_ancestor_of(id)).unwrap_or(false) {
if source.is_primary() {
mgr.grab_press_unique(self.id(), source, coord, None);
let any_menu_open = self.bar.iter().any(|w| w.menu_is_open());
let press_in_the_bar = self.rect().contains(coord);

if !press_in_the_bar || !any_menu_open {
mgr.grab_press_unique(self.id(), source, coord, None);
}
mgr.set_grab_depress(source, start_id.clone());
self.opening = false;
if self.rect().contains(coord) {
if press_in_the_bar {
if self
.bar
.iter()
.any(|w| w.eq_id(&start_id) && !w.menu_is_open())
{
self.opening = true;
self.set_menu_path(mgr, start_id.as_ref(), false);
} else {
self.set_menu_path(mgr, None, false);
}
} else {
let delay = mgr.config().menu_delay();
mgr.update_on_timer(delay, self.id(), WidgetId::opt_to_u64(start_id.as_ref()));
self.delayed_open = start_id;
}
}
Response::Used
} else {
// Click happened out of the menubar or submenus,
// while one or more submenus are opened.
self.delayed_open = None;
Response::Unused
}
Expand All @@ -108,45 +106,40 @@ widget! {
..
} => {
mgr.set_grab_depress(source, cur_id.clone());
if let Some(id) = cur_id {
if self.bar.is_strict_ancestor_of(&id) {
// We instantly open a sub-menu on motion over the bar,
// but delay when over a sub-menu (most intuitive?)
if self.rect().contains(coord) && !self.bar.eq_id(&id) {
self.set_menu_path(mgr, Some(&id), false);
} else if id != self.delayed_open {
mgr.set_nav_focus(id.clone(), false);
let delay = mgr.config().menu_delay();
mgr.update_on_timer(delay, self.id(), id.as_u64());
self.delayed_open = Some(id);
}

let id = match cur_id {
Some(x) => x,
None => return Response::Used,
};

if self.bar.is_strict_ancestor_of(&id) {
// We instantly open a sub-menu on motion over the bar,
// but delay when over a sub-menu (most intuitive?)
if self.rect().contains(coord) {
mgr.set_nav_focus(self.id(), false);
self.delayed_open = None;
self.set_menu_path(mgr, Some(&id), false);
} else if id != self.delayed_open {
mgr.set_nav_focus(id.clone(), false);
let delay = mgr.config().menu_delay();
mgr.update_on_timer(delay, self.id(), id.as_u64());
self.delayed_open = Some(id.clone());
}
} else {
self.delayed_open = None;
}
Response::Used
}
Event::PressEnd { coord, end_id, success, .. } if success => {
if end_id.as_ref().map(|id| self.is_ancestor_of(id)).unwrap_or(false) {
// end_id is a child of self
let id = end_id.unwrap();
let id = match end_id {
Some(x) => x,
None => return Response::Used,
};

if self.rect().contains(coord) {
// end coordinate is on the menubar
if !self.opening {
self.delayed_open = None;
for i in 0..self.bar.len() {
if self.bar[i].eq_id(&id) {
self.bar[i].set_menu_path(mgr, None, false);
}
}
}
} else {
// not on the menubar, thus on a sub-menu
self.delayed_open = None;
return self.send(mgr, id, Event::Activate);
}
} else {
// not on the menu
self.set_menu_path(mgr, None, false);
if !self.rect().contains(coord) {
// not on the menubar
self.delayed_open = None;
return self.send(mgr, id, Event::Activate);
}
Response::Used
}
Expand Down
6 changes: 5 additions & 1 deletion crates/kas-widgets/src/menu/submenu.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ widget! {
#[widget]
pub list: Column<W>,
popup_id: Option<WindowId>,
closing_menu: bool,
}

impl Self where D: Default {
Expand Down Expand Up @@ -68,6 +69,7 @@ widget! {
frame_store: Default::default(),
list: Column::new(list),
popup_id: None,
closing_menu: false,
}
}

Expand All @@ -86,6 +88,7 @@ widget! {
fn close_menu(&mut self, mgr: &mut EventMgr, restore_focus: bool) {
if let Some(id) = self.popup_id {
mgr.close_window(id, restore_focus);
self.closing_menu = true;
}
}

Expand Down Expand Up @@ -144,7 +147,7 @@ widget! {

fn draw(&mut self, mut draw: DrawMgr) {
let mut draw = draw.with_core(self.core_data());
if self.popup_id.is_some() {
if self.popup_id.is_some() && !self.closing_menu {
draw.state.insert(InputState::DEPRESS);
}
draw.menu_entry(self.core.rect);
Expand All @@ -171,6 +174,7 @@ widget! {
Event::PopupRemoved(id) => {
debug_assert_eq!(Some(id), self.popup_id);
self.popup_id = None;
self.closing_menu = false;
Response::Used
}
Event::Command(cmd, _) => self.handle_dir_key(mgr, cmd),
Expand Down

0 comments on commit 5afee82

Please sign in to comment.