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

fix(segmented-button): context menu state management

Browse source
This commit is contained in:
Ashley Wulber 2025-06-19 09:36:07 -04:00 • committed by Jeremy Soller
parent 6be5403852
commit 5be9611c8a
1 changed files with 8 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -647,16 +647,9 @@ where
// Diff the context menu // Diff the context menu
if let Some(context_menu) = &mut self.context_menu { if let Some(context_menu) = &mut self.context_menu {
if tree.children.is_empty() { state.menu_state.inner.with_data_mut(|inner| {
let mut child_tree = Tree::empty(); menu_roots_diff(context_menu, &mut inner.tree);
child_tree.state = tree::State::new(MenuBarState::default()); });
tree.children.push(child_tree);
} else {
tree.children.truncate(1);
}
menu_roots_diff(context_menu, &mut tree.children[0]);
} else {
tree.children.clear();
} }
} }
@ -954,9 +947,7 @@ where
state.context_cursor = state.context_cursor =
cursor_position.position().unwrap_or_default(); cursor_position.position().unwrap_or_default();
let menu_state = state.menu_state.inner.with_data_mut(|data| {
tree.children[0].state.downcast_mut::<MenuBarState>();
menu_state.inner.with_data_mut(|data| {
data.open = true; data.open = true;
data.view_cursor = cursor_position; data.view_cursor = cursor_position;
}); });
@ -1593,22 +1584,17 @@ where
return None; return None;
}; };
if !tree.children[0] if !menu_state.inner.with_data(|data| data.open) {
.state // If the menu is not open, we don't need to show it.
.downcast_ref::<MenuBarState>()
.inner
.with_data(|data| data.open)
{
return None; return None;
} }
bounds.x = state.context_cursor.x; bounds.x = state.context_cursor.x;
bounds.y = state.context_cursor.y; bounds.y = state.context_cursor.y;
Some( Some(
crate::widget::menu::Menu { crate::widget::menu::Menu {
tree: menu_state, tree: menu_state,
menu_roots: std::borrow::Cow::Borrowed(context_menu), menu_roots: std::borrow::Cow::Owned(context_menu.clone()),
bounds_expand: 16, bounds_expand: 16,
menu_overlays_parent: true, menu_overlays_parent: true,
close_condition: CloseCondition { close_condition: CloseCondition {
@ -1619,7 +1605,7 @@ where
item_width: ItemWidth::Uniform(240), item_width: ItemWidth::Uniform(240),
item_height: ItemHeight::Dynamic(40), item_height: ItemHeight::Dynamic(40),
bar_bounds: bounds, bar_bounds: bounds,
main_offset: -(bounds.height as i32), main_offset: -bounds.height as i32,
cross_offset: 0, cross_offset: 0,
root_bounds_list: vec![bounds], root_bounds_list: vec![bounds],
path_highlight: Some(PathHighlight::MenuActive), path_highlight: Some(PathHighlight::MenuActive),