alex/muda
1
0
Fork 0
mirror of https://github.com/italicsjenga/muda.git synced 2024-12-23 20:11:29 +11:00
Code Issues Packages Projects Releases Wiki Activity

fix(linux): fix multiple borrow panic (#48)

Browse source 
* fix(linux): fix multiple borrow panic, fixes #40

* chore: update example

* update docs
This commit is contained in:
Amr Bashir 2023-02-14 14:45:35 +02:00 committed by GitHub
parent 8a949c2216
commit 923af09abf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.changes/checked-borrow-panic.md Normal file
View file

@ -0,0 +1,5 @@
---
"muda": "patch"
---
Fix panic when updating a `CheckMenuItem` right after it was clicked.

1
examples/tao.rs
View file

@ -106,6 +106,7 @@ fn main() {
&window_m, &window_m,
&PredefinedMenuItem::separator(), &PredefinedMenuItem::separator(),
&check_custom_i_1, &check_custom_i_1,
&check_custom_i_2,
]); ]);
window_m.append_items(&[ window_m.append_items(&[

1
examples/winit.rs
View file

@ -101,6 +101,7 @@ fn main() {
&window_m, &window_m,
&PredefinedMenuItem::separator(), &PredefinedMenuItem::separator(),
&check_custom_i_1, &check_custom_i_1,
&check_custom_i_2,
]); ]);
window_m.append_items(&[ window_m.append_items(&[

5
src/icon_menu_item.rs
View file

@ -4,9 +4,8 @@
use crate::{accelerator::Accelerator, icon::Icon, MenuItemExt, MenuItemType}; use crate::{accelerator::Accelerator, icon::Icon, MenuItemExt, MenuItemType};
/// A check menu item inside a [`Menu`] or [`Submenu`] /// An icon menu item inside a [`Menu`] or [`Submenu`]
/// and usually contains a text and a check mark or a similar toggle /// and usually contains an icon and a text.
/// that corresponds to a checked and unchecked states.
/// ///
/// [`Menu`]: crate::Menu /// [`Menu`]: crate::Menu
/// [`Submenu`]: crate::Submenu /// [`Submenu`]: crate::Submenu

5
src/platform_impl/gtk/mod.rs
View file

@ -1041,10 +1041,9 @@ impl CheckMenuItem {
let id = self_.id; let id = self_.id;
let self_c = self.0.clone(); let self_c = self.0.clone();
let is_syncing_checked_state = self_.is_syncing_checked_state.clone();
item.connect_toggled(move |i| { item.connect_toggled(move |i| {
let should_dispatch = self_c let should_dispatch = is_syncing_checked_state
.borrow()
.is_syncing_checked_state
.compare_exchange(false, true, Ordering::Release, Ordering::Relaxed) .compare_exchange(false, true, Ordering::Release, Ordering::Relaxed)
.is_ok(); .is_ok();