leyoda/iced-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

fixes: various fixes and cleanup

Browse source
This commit is contained in:
Ashley Wulber 2026-02-19 17:01:13 -05:00
parent b4346ff3ca
commit c1edb81084
No known key found for this signature in database
GPG key ID: 5216D4F46A90A820
27 changed files with 676 additions and 1455 deletions
Download patch file Download diff file Expand all files Collapse all files

6
core/src/length.rs
View file

@ -78,6 +78,12 @@ impl From<f32> for Length {
}
}
impl From<i32> for Length {
fn from(amount: i32) -> Self {
Length::Fixed(amount as f32)
}
}
impl From<u16> for Length {
fn from(amount: u16) -> Self {
Length::Fixed(amount as f32)

1
core/src/mouse/click.rs
View file

@ -46,7 +46,6 @@ impl Click {
previous: Option<Click>,
) -> Click {
let time = Instant::now();
let kind = if let Some(previous) = previous {
if previous.is_consecutive(position, time)
&& button == previous.button

16
core/src/widget/tree.rs
View file

@ -147,7 +147,6 @@ impl Tree {
None
}
/// Reconciliates the current tree with the provided [`Widget`].
///
/// If the tag of the [`Widget`] matches the tag of the [`Tree`], then the
@ -166,9 +165,10 @@ impl Tree {
new.borrow_mut();
let mut tag_match = self.tag == borrowed.tag();
if tag_match {
if let Some(Id(Internal::Custom(_, n))) = borrowed.id() {
let mut named = NAMED
if let Some((mut state, children)) = NAMED
.with(|named| named.borrow_mut().remove(&n))
.or_else(|| {
//check self.id
@ -199,14 +199,14 @@ impl Tree {
} else {
None
}
});
if let Some((mut state, children)) = named {
})
{
std::mem::swap(&mut self.state, &mut state);
let widget_children = borrowed.children();
if !tag_match
|| self.children.len() != widget_children.len()
{
self.children = borrowed.children();
self.children = widget_children;
} else {
for (old_i, mut old) in children {
let Some(my_state) = self.children.get_mut(old_i)
@ -244,8 +244,10 @@ impl Tree {
if let Some(id) = self.id.clone() {
borrowed.set_id(id);
}
if self.children.len() != borrowed.children().len() {
self.children = borrowed.children();
let borrowed_children = borrowed.children();
if self.children.len() != borrowed_children.len() {
self.children = borrowed_children;
}
}
}