Introduce selector flag and decouple iced_widget from iced_runtime
This commit is contained in:
parent
34a42b5ad4
commit
81d1eda7fe
22 changed files with 118 additions and 67 deletions
|
|
@ -9,7 +9,6 @@ use crate::core::widget::tree::{self, Tree};
|
|||
use crate::core::{
|
||||
self, Clipboard, Element, Length, Rectangle, Shell, Size, Vector, Widget,
|
||||
};
|
||||
use crate::runtime::overlay::Nested;
|
||||
|
||||
use ouroboros::self_referencing;
|
||||
use std::cell::RefCell;
|
||||
|
|
@ -472,7 +471,9 @@ where
|
|||
viewport,
|
||||
translation,
|
||||
)
|
||||
.map(|overlay| RefCell::new(Nested::new(overlay)))
|
||||
.map(|overlay| {
|
||||
RefCell::new(overlay::Nested::new(overlay))
|
||||
})
|
||||
},
|
||||
)
|
||||
},
|
||||
|
|
@ -519,7 +520,7 @@ struct Inner<'a, 'b, Message, Theme, Renderer, Event, S> {
|
|||
|
||||
#[borrows(mut instance, mut tree)]
|
||||
#[not_covariant]
|
||||
overlay: Option<RefCell<Nested<'this, Event, Theme, Renderer>>>,
|
||||
overlay: Option<RefCell<overlay::Nested<'this, Event, Theme, Renderer>>>,
|
||||
}
|
||||
|
||||
struct OverlayInstance<'a, 'b, Message, Theme, Renderer, Event, S> {
|
||||
|
|
@ -531,7 +532,7 @@ impl<Message, Theme, Renderer, Event, S>
|
|||
{
|
||||
fn with_overlay_maybe<T>(
|
||||
&self,
|
||||
f: impl FnOnce(&mut Nested<'_, Event, Theme, Renderer>) -> T,
|
||||
f: impl FnOnce(&mut overlay::Nested<'_, Event, Theme, Renderer>) -> T,
|
||||
) -> Option<T> {
|
||||
self.overlay
|
||||
.as_ref()
|
||||
|
|
@ -546,7 +547,7 @@ impl<Message, Theme, Renderer, Event, S>
|
|||
|
||||
fn with_overlay_mut_maybe<T>(
|
||||
&mut self,
|
||||
f: impl FnOnce(&mut Nested<'_, Event, Theme, Renderer>) -> T,
|
||||
f: impl FnOnce(&mut overlay::Nested<'_, Event, Theme, Renderer>) -> T,
|
||||
) -> Option<T> {
|
||||
self.overlay
|
||||
.as_mut()
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue