chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

a working build of the new update

Browse source
This commit is contained in:
Chris Cochrun 2026-04-03 15:14:07 -05:00
parent ff2bfc4f86
commit f3d0ec9aa2
10 changed files with 342 additions and 347 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/ui/widgets/draggable/column.rs
View file

@ -434,9 +434,7 @@ where
clipboard: &mut dyn Clipboard,
shell: &mut Shell<'_, Message>,
viewport: &Rectangle,
) -> event::Status {
let mut event_status = event::Status::Ignored;
) {
let action = tree.state.downcast_mut::<Action>();
match event {
@ -457,7 +455,7 @@ where
index,
origin: cursor_position,
};
event_status = event::Status::Captured;
shell.capture_event();
break;
}
}
@ -482,7 +480,7 @@ where
DragEvent::Picked { index },
));
}
event_status = event::Status::Captured;
shell.capture_event();
}
}
Action::Dragging { origin, index, .. } => {
@ -494,7 +492,7 @@ where
origin,
index,
};
event_status = event::Status::Captured;
shell.capture_event();
}
}
_ => {}
@ -527,8 +525,7 @@ where
drop_position,
},
));
event_status =
event::Status::Captured;
shell.capture_event();
}
} else if let Some(on_reorder) =
&self.on_drag
@ -536,8 +533,7 @@ where
shell.publish(on_reorder(
DragEvent::Canceled { index },
));
event_status =
event::Status::Captured;
shell.capture_event();
}
}
*action = Action::Idle;
@ -552,12 +548,11 @@ where
_ => {}
}
let child_status = self
.children
self.children
.iter_mut()
.zip(&mut tree.children)
.zip(layout.children())
.map(|((child, state), c_layout)| {
.for_each(|((child, state), c_layout)| {
child.as_widget_mut().update(
state,
&event.clone(),
@ -569,18 +564,7 @@ where
shell,
viewport,
)
})
.fold(
event::Status::Ignored,
|arg0: cosmic::iced::event::Status, arg1: ()| {
event::Status::merge(
event::Status::Ignored,
arg0, /* cosmic::iced::event::Status */
)
},
);
event::Status::merge(event_status, child_status)
});
}
fn mouse_interaction(

33
src/ui/widgets/draggable/row.rs
View file

@ -421,9 +421,7 @@ where
clipboard: &mut dyn Clipboard,
shell: &mut Shell<'_, Message>,
viewport: &Rectangle,
) -> event::Status {
let mut event_status = event::Status::Ignored;
) {
let action = tree.state.downcast_mut::<Action>();
match event {
@ -444,7 +442,7 @@ where
index,
origin: cursor_position,
};
event_status = event::Status::Captured;
shell.capture_event();
break;
}
}
@ -469,7 +467,7 @@ where
DragEvent::Picked { index },
));
}
event_status = event::Status::Captured;
shell.capture_event();
}
}
Action::Dragging { origin, index, .. } => {
@ -481,7 +479,7 @@ where
origin,
index,
};
event_status = event::Status::Captured;
shell.capture_event();
}
}
_ => {}
@ -514,8 +512,7 @@ where
drop_position,
},
));
event_status =
event::Status::Captured;
shell.capture_event();
}
} else if let Some(on_reorder) =
&self.on_drag
@ -523,8 +520,7 @@ where
shell.publish(on_reorder(
DragEvent::Canceled { index },
));
event_status =
event::Status::Captured;
shell.capture_event();
}
}
*action = Action::Idle;
@ -544,7 +540,7 @@ where
.iter_mut()
.zip(&mut tree.children)
.zip(layout.children())
.map(|((child, state), layout)| {
.for_each(|((child, state), layout)| {
child.as_widget_mut().update(
state,
&event.clone(),
@ -555,18 +551,7 @@ where
shell,
viewport,
)
})
.fold(
event::Status::Ignored,
|arg0: cosmic::iced::event::Status, arg1: ()| {
event::Status::merge(
event::Status::Ignored,
arg0, /* cosmic::iced::event::Status */
)
},
);
event::Status::merge(event_status, child_status)
});
}
fn mouse_interaction(
@ -953,7 +938,7 @@ where
clipboard: &mut dyn Clipboard,
shell: &mut Shell<'_, Message>,
viewport: &Rectangle,
) -> event::Status {
) {
self.row.update(
tree, event, layout, cursor, renderer, clipboard, shell,
viewport,

2
src/ui/widgets/mod.rs
View file

@ -2,5 +2,5 @@
#[allow(clippy::nursery)]
#[allow(clippy::pedantic)]
pub mod draggable;
pub mod slide_text;
// pub mod slide_text;
pub mod verse_editor;