leyoda/libcosmic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(segmented-button): crash when context menu is unassigned

Browse source
This commit is contained in:
Michael Aaron Murphy 2024-04-19 11:20:20 +02:00
parent 537486a4ab
commit c0b653f506
No known key found for this signature in database
GPG key ID: B2732D4240C9212C
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/widget/segmented_button/widget.rs
View file

@ -883,23 +883,25 @@ where
} }
// Present a context menu on a right click event. // Present a context menu on a right click event.
if let Some(on_context) = self.on_context.as_ref() { if self.context_menu.is_some() {
if right_button_released(&event) if let Some(on_context) = self.on_context.as_ref() {
|| (touch_lifted(&event) && fingers_pressed == 2) if right_button_released(&event)
{ || (touch_lifted(&event) && fingers_pressed == 2)
state.show_context = Some(key); {
state.context_cursor = state.show_context = Some(key);
cursor_position.position().unwrap_or_default(); state.context_cursor =
state.focused = true; cursor_position.position().unwrap_or_default();
state.focused_item = Item::Tab(key); state.focused = true;
state.focused_item = Item::Tab(key);
let menu_state = let menu_state =
tree.children[0].state.downcast_mut::<MenuBarState>(); tree.children[0].state.downcast_mut::<MenuBarState>();
menu_state.open = true; menu_state.open = true;
menu_state.view_cursor = cursor_position; menu_state.view_cursor = cursor_position;
shell.publish(on_context(key)); shell.publish(on_context(key));
return event::Status::Captured; return event::Status::Captured;
}
} }
} }
} }