Fixed infinite loop due to variable shadowing.

Fmt.
This commit is contained in:
Well 2024-01-05 18:57:42 -03:00
parent 67978312fe
commit f744174ec1
5 changed files with 5 additions and 10 deletions

View File

@ -1,8 +1,3 @@
# Context Menu
* Opening and closing a ContextMenu by clicking on the window causes the app to become stuck.
- Does not print update trace.
# TextInput
* Implement selection toolbar.

View File

@ -482,8 +482,8 @@ mod context {
use zero_ui::{
app::{AppExtended, AppExtension, HeadlessApp},
prelude::*,
var::{AnyWhenVarBuilder, ContextInitHandle},
prelude_wgt::*,
var::{AnyWhenVarBuilder, ContextInitHandle},
};
context_var! {

View File

@ -2049,7 +2049,7 @@ impl<'a> FocusInfoBuilder<'a> {
}
/// Sets [`focusable`], only if it was not already set.
///
///
/// [`focusable`]: Self::focusable
pub fn focusable_passive(&mut self, is_focusable: bool) -> &mut Self {
self.with_data(|data| {

View File

@ -159,8 +159,8 @@ pub fn sub_menu_popup_node(children: ArcNodeList<BoxedUiNodeList>, parent: Optio
}
UiNodeOp::Info { info } => {
// sub-menus set the popup as parent in context menu.
let parent = Some(parent.unwrap_or_else(|| WIDGET.id()));
super::sub::SUB_MENU_PARENT_CTX.with_context(&mut Some(Arc::new(parent)), || c.info(info));
let parent_ctx = Some(parent.unwrap_or_else(|| WIDGET.id()));
super::sub::SUB_MENU_PARENT_CTX.with_context(&mut Some(Arc::new(parent_ctx)), || c.info(info));
info.set_meta(&super::sub::SUB_MENU_POPUP_ID, super::sub::SubMenuPopupInfo { parent });
}
UiNodeOp::Event { update } => {

View File

@ -10,7 +10,7 @@ use crate::prelude::*;
/// this is very efficient, but assumes that the widget is *filled*, if the widget has visual *holes* the user may be able
/// to see another widget underneath but be unable to click on it.
///
/// If you have a widget with a complex shape or with *holes*, set this property to [`HitTestMode::Detailed`] to enable the
/// If you have a widget with a complex shape or with *holes*, set this property to [`HitTestMode::Detailed`] to enable the
/// full hit-testing power where all render primitives and clips used to render the widget are considered during hit-testing.
///
/// [`hit_testable`]: fn@hit_testable