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

refactor!: remove cosmic::iced_* re-exports

Browse source
This commit is contained in:
Adam Cosner 2026-04-08 01:12:10 +00:00 • committed by GitHub
parent d9121d6f0d
commit 5d1dfc4c54
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 77 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/widget/calendar.rs
View file

@ -4,10 +4,10 @@
//! A widget that displays an interactive calendar.
use crate::fl;
use crate::iced_core::{Alignment, Length};
use crate::widget::{button, column, grid, icon, row, text};
use apply::Apply;
use iced::alignment::Vertical;
use iced_core::{Alignment, Length};
use jiff::{
ToSpan,
civil::{Date, Weekday},

9
src/widget/cards.rs
View file

@ -1,13 +1,8 @@
//! An expandable stack of cards
use std::time::Duration;
use self::iced_core::{
Element, Event, Length, Size, Vector, Widget, border::Radius, id::Id, layout::Node,
renderer::Quad, widget::Tree,
};
use crate::{
anim,
iced_core::{self, Border, Shadow},
widget::{
button,
card::style::Style,
@ -18,6 +13,10 @@ use crate::{
};
use float_cmp::approx_eq;
use iced::widget;
use iced_core::{
Border, Element, Event, Length, Shadow, Size, Vector, Widget, border::Radius, id::Id,
layout::Node, renderer::Quad, widget::Tree,
};
use iced_core::{widget::tree, window};
const ICON_SIZE: u16 = 16;

29
src/widget/dnd_destination.rs
View file

@ -7,23 +7,24 @@ use iced::Vector;
use crate::{
Element,
iced::{
Event, Length, Rectangle,
clipboard::{
dnd::{self, DndAction, DndDestinationRectangle, DndEvent, OfferEvent},
mime::AllowedMimeTypes,
},
event,
id::Internal,
mouse, overlay,
},
iced_core::{
self, Clipboard, Shell, layout,
widget::{Tree, tree},
},
widget::{Id, Widget},
};
use iced::{
Event, Length, Rectangle,
clipboard::{
dnd::{self, DndAction, DndDestinationRectangle, DndEvent, OfferEvent},
mime::AllowedMimeTypes,
},
event,
id::Internal,
mouse, overlay,
};
use iced_core::{
self, Clipboard, Shell, layout,
widget::{Tree, tree},
};
pub fn dnd_destination<'a, Message: 'static>(
child: impl Into<Element<'a, Message>>,
mimes: Vec<Cow<'static, str>>,

18
src/widget/dnd_source.rs
View file

@ -4,17 +4,17 @@ use iced_core::{widget::Operation, window};
use crate::{
Element,
iced::{
Event, Length, Point, Rectangle, Vector,
clipboard::dnd::{DndAction, DndEvent, SourceEvent},
event, mouse, overlay,
},
iced_core::{
self, Clipboard, Shell, layout, renderer,
widget::{Tree, tree},
},
widget::{Id, Widget, container},
};
use iced::{
Event, Length, Point, Rectangle, Vector,
clipboard::dnd::{DndAction, DndEvent, SourceEvent},
event, mouse, overlay,
};
use iced_core::{
self, Clipboard, Shell, layout, renderer,
widget::{Tree, tree},
};
pub fn dnd_source<
'a,

2
src/widget/menu/menu_tree.rs
View file

@ -9,11 +9,11 @@ use std::rc::Rc;
use iced::advanced::widget::text::Style as TextStyle;
use iced_widget::core::{Element, renderer};
use crate::iced_core::{Alignment, Length};
use crate::widget::menu::action::MenuAction;
use crate::widget::menu::key_bind::KeyBind;
use crate::widget::{Button, RcElementWrapper, icon};
use crate::{theme, widget};
use iced_core::{Alignment, Length};
/// Nested menu is essentially a tree of items, a menu is a collection of items
/// a menu itself can also be an item of another menu.

6
src/widget/segmented_button/widget.rs
View file

@ -3,7 +3,6 @@
use super::model::{Entity, Model, Selectable};
use super::{InsertPosition, ReorderEvent};
use crate::iced_core::id::Internal;
use crate::theme::{SegmentedButton as Style, THEME};
use crate::widget::dnd_destination::DragId;
use crate::widget::menu::{
@ -22,6 +21,7 @@ use iced::{
Alignment, Background, Color, Event, Length, Padding, Rectangle, Size, Task, Vector, alignment,
keyboard, mouse, touch, window,
};
use iced_core::id::Internal;
use iced_core::mouse::ScrollDelta;
use iced_core::text::{self, Ellipsize, LineHeight, Renderer as TextRenderer, Shaping, Wrapping};
use iced_core::widget::operation::Focusable;
@ -2043,10 +2043,10 @@ where
..image_bounds
},
crate::widget::icon(match crate::widget::common::object_select().data() {
crate::iced_core::svg::Data::Bytes(bytes) => {
iced_core::svg::Data::Bytes(bytes) => {
crate::widget::icon::from_svg_bytes(bytes.as_ref()).symbolic(true)
}
crate::iced_core::svg::Data::Path(path) => {
iced_core::svg::Data::Path(path) => {
crate::widget::icon::from_path(path.clone())
}
}),

12
src/widget/toggler.rs
View file

@ -2,18 +2,18 @@
use std::time::{Duration, Instant};
use crate::{Element, anim, iced_core::Border, iced_widget::toggler::Status};
use crate::{Element, anim};
use iced_core::{
Clipboard, Event, Layout, Length, Pixels, Rectangle, Shell, Size, Widget, alignment, event,
layout, mouse,
Border, Clipboard, Event, Layout, Length, Pixels, Rectangle, Shell, Size, Widget, alignment,
event, layout, mouse,
renderer::{self, Renderer},
text, touch,
widget::{self, Tree, tree},
window,
};
use iced_widget::Id;
use iced_widget::{Id, toggler::Status};
pub use crate::iced_widget::toggler::{Catalog, Style};
pub use iced_widget::toggler::{Catalog, Style};
pub fn toggler<'a, Message>(is_checked: bool) -> Toggler<'a, Message> {
Toggler::new(is_checked)
@ -200,7 +200,7 @@ impl<'a, Message> Widget<Message, crate::Theme, crate::Renderer> for Toggler<'a,
align_x: self.text_alignment,
align_y: alignment::Vertical::Top,
shaping: self.text_shaping,
wrapping: crate::iced_core::text::Wrapping::default(),
wrapping: iced_core::text::Wrapping::default(),
ellipsize: self.ellipsize,
},
);

36
src/widget/wrapper.rs
View file

@ -93,8 +93,8 @@ impl<M> Widget<M, crate::Theme, crate::Renderer> for RcElementWrapper<M> {
&mut self,
tree: &mut tree::Tree,
renderer: &crate::Renderer,
limits: &crate::iced_core::layout::Limits,
) -> crate::iced_core::layout::Node {
limits: &iced_core::layout::Limits,
) -> iced_core::layout::Node {
self.element
.with_data_mut(|e| e.as_widget_mut().layout(tree, renderer, limits))
}
@ -104,9 +104,9 @@ impl<M> Widget<M, crate::Theme, crate::Renderer> for RcElementWrapper<M> {
tree: &tree::Tree,
renderer: &mut crate::Renderer,
theme: &crate::Theme,
style: &crate::iced_core::renderer::Style,
layout: crate::iced_core::Layout<'_>,
cursor: crate::iced_core::mouse::Cursor,
style: &iced_core::renderer::Style,
layout: iced_core::Layout<'_>,
cursor: iced_core::mouse::Cursor,
viewport: &Rectangle,
) {
self.element.with_data(move |e| {
@ -134,7 +134,7 @@ impl<M> Widget<M, crate::Theme, crate::Renderer> for RcElementWrapper<M> {
fn operate(
&mut self,
state: &mut tree::Tree,
layout: crate::iced_core::Layout<'_>,
layout: iced_core::Layout<'_>,
renderer: &crate::Renderer,
operation: &mut dyn widget::Operation,
) {
@ -148,11 +148,11 @@ impl<M> Widget<M, crate::Theme, crate::Renderer> for RcElementWrapper<M> {
&mut self,
state: &mut tree::Tree,
event: &crate::iced::Event,
layout: crate::iced_core::Layout<'_>,
cursor: crate::iced_core::mouse::Cursor,
layout: iced_core::Layout<'_>,
cursor: iced_core::mouse::Cursor,
renderer: &crate::Renderer,
clipboard: &mut dyn crate::iced_core::Clipboard,
shell: &mut crate::iced_core::Shell<'_, M>,
clipboard: &mut dyn iced_core::Clipboard,
shell: &mut iced_core::Shell<'_, M>,
viewport: &Rectangle,
) {
self.element.with_data_mut(|e| {
@ -165,11 +165,11 @@ impl<M> Widget<M, crate::Theme, crate::Renderer> for RcElementWrapper<M> {
fn mouse_interaction(
&self,
state: &tree::Tree,
layout: crate::iced_core::Layout<'_>,
cursor: crate::iced_core::mouse::Cursor,
layout: iced_core::Layout<'_>,
cursor: iced_core::mouse::Cursor,
viewport: &Rectangle,
renderer: &crate::Renderer,
) -> crate::iced_core::mouse::Interaction {
) -> iced_core::mouse::Interaction {
self.element.with_data(|e| {
e.as_widget()
.mouse_interaction(state, layout, cursor, viewport, renderer)
@ -179,11 +179,11 @@ impl<M> Widget<M, crate::Theme, crate::Renderer> for RcElementWrapper<M> {
fn overlay<'a>(
&'a mut self,
state: &'a mut tree::Tree,
layout: crate::iced_core::Layout<'a>,
layout: iced_core::Layout<'a>,
renderer: &crate::Renderer,
viewport: &Rectangle,
translation: crate::iced_core::Vector,
) -> Option<crate::iced_core::overlay::Element<'a, M, crate::Theme, crate::Renderer>> {
translation: iced_core::Vector,
) -> Option<iced_core::overlay::Element<'a, M, crate::Theme, crate::Renderer>> {
assert_eq!(self.element.thread_id, thread::current().id());
Rc::get_mut(&mut self.element.data).and_then(|e| {
e.get_mut()
@ -203,9 +203,9 @@ impl<M> Widget<M, crate::Theme, crate::Renderer> for RcElementWrapper<M> {
fn drag_destinations(
&self,
state: &tree::Tree,
layout: crate::iced_core::Layout<'_>,
layout: iced_core::Layout<'_>,
renderer: &crate::Renderer,
dnd_rectangles: &mut crate::iced_core::clipboard::DndDestinationRectangles,
dnd_rectangles: &mut iced_core::clipboard::DndDestinationRectangles,
) {
self.element.with_data_mut(|e| {
e.as_widget_mut()