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

wip: update to use latest iced

Browse source
This commit is contained in:
Ashley Wulber 2024-01-30 22:14:00 -05:00 • committed by Ashley Wulber
parent ca1469a6b2
commit f4ad098647
49 changed files with 956 additions and 854 deletions
Download patch file Download diff file Expand all files Collapse all files

67
src/widget/dropdown/multi/menu.rs
View file

@ -9,8 +9,8 @@ use iced_core::layout::{self, Layout};
use iced_core::text::{self, Text};
use iced_core::widget::Tree;
use iced_core::{
alignment, mouse, overlay, renderer, svg, touch, Clipboard, Color, Element, Length, Padding,
Pixels, Point, Rectangle, Renderer, Shell, Size, Vector, Widget,
alignment, mouse, overlay, renderer, svg, touch, Border, Clipboard, Element, Length, Padding,
Pixels, Point, Rectangle, Renderer, Shadow, Shell, Size, Vector, Widget,
};
use iced_widget::scrollable::Scrollable;
@ -98,7 +98,7 @@ where
self,
position: Point,
target_height: f32,
) -> overlay::Element<'a, Message, crate::Renderer> {
) -> overlay::Element<'a, Message, crate::Theme, crate::Renderer> {
overlay::Element::new(position, Box::new(Overlay::new(self, target_height)))
}
}
@ -127,7 +127,7 @@ impl Default for State {
struct Overlay<'a, Message> {
state: &'a mut Tree,
container: Container<'a, Message, crate::Renderer>,
container: Container<'a, Message, crate::Theme, crate::Renderer>,
width: f32,
target_height: f32,
style: (),
@ -177,7 +177,7 @@ impl<'a, Message: 'a> Overlay<'a, Message> {
.padding(padding)
.style(crate::style::Container::Dropdown);
state.tree.diff(&mut container as &mut dyn Widget<_, _>);
state.tree.diff(&mut container as &mut dyn Widget<_, _, _>);
Self {
state: &mut state.tree,
@ -189,7 +189,9 @@ impl<'a, Message: 'a> Overlay<'a, Message> {
}
}
impl<'a, Message> iced_core::Overlay<Message, crate::Renderer> for Overlay<'a, Message> {
impl<'a, Message> iced_core::Overlay<Message, crate::Theme, crate::Renderer>
for Overlay<'a, Message>
{
fn layout(
&mut self,
renderer: &crate::Renderer,
@ -215,7 +217,7 @@ impl<'a, Message> iced_core::Overlay<Message, crate::Renderer> for Overlay<'a, M
let mut node = self.container.layout(self.state, renderer, &limits);
node.move_to(if space_below > space_above {
node = node.clone().move_to(if space_below > space_above {
position + Vector::new(0.0, self.target_height)
} else {
position - Vector::new(0.0, node.size().height)
@ -265,9 +267,12 @@ impl<'a, Message> iced_core::Overlay<Message, crate::Renderer> for Overlay<'a, M
renderer.fill_quad(
renderer::Quad {
bounds,
border_color: appearance.border_color,
border_width: appearance.border_width,
border_radius: appearance.border_radius,
border: Border {
width: appearance.border_width,
color: appearance.border_color,
radius: appearance.border_radius,
},
shadow: Shadow::default(),
},
appearance.background,
);
@ -289,17 +294,14 @@ struct InnerList<'a, S, Item, Message> {
selected_icon: Option<svg::Handle>,
}
impl<'a, S, Item, Message> Widget<Message, crate::Renderer> for InnerList<'a, S, Item, Message>
impl<'a, S, Item, Message> Widget<Message, crate::Theme, crate::Renderer>
for InnerList<'a, S, Item, Message>
where
S: AsRef<str>,
Item: Clone + PartialEq,
{
fn width(&self) -> Length {
Length::Fill
}
fn height(&self) -> Length {
Length::Shrink
fn size(&self) -> Size<Length> {
Size::new(Length::Fill, Length::Shrink)
}
fn layout(
@ -338,7 +340,7 @@ where
separators + descriptions + options
});
limits.resolve(intrinsic)
limits.resolve(Length::Fill, Length::Shrink, intrinsic)
};
layout::Node::new(size)
@ -539,9 +541,11 @@ where
renderer.fill_quad(
renderer::Quad {
bounds,
border_color: Color::TRANSPARENT,
border_width: 0.0,
border_radius: appearance.border_radius,
border: Border {
radius: appearance.border_radius,
..Default::default()
},
shadow: Shadow::default(),
},
appearance.selected_background,
);
@ -574,9 +578,11 @@ where
renderer.fill_quad(
renderer::Quad {
bounds,
border_color: Color::TRANSPARENT,
border_width: 0.0,
border_radius: appearance.border_radius,
border: Border {
radius: appearance.border_radius,
..Default::default()
},
shadow: Shadow::default(),
},
appearance.hovered_background,
);
@ -614,18 +620,17 @@ where
OptionElement::Separator => {
let divider = crate::widget::divider::horizontal::light().height(1.0);
let mut layout_node = layout::Node::new(Size {
let layout_node = layout::Node::new(Size {
width: bounds.width,
height: 1.0,
});
layout_node.move_to(Point {
})
.move_to(Point {
x: bounds.x,
y: bounds.y + (self.padding.vertical() / 2.0) - 4.0,
});
Widget::<Message, crate::Renderer>::draw(
&crate::Element::<Message>::from(divider),
Widget::<Message, crate::Theme, crate::Renderer>::draw(
crate::Element::<Message>::from(divider).as_widget(),
&Tree::empty(),
renderer,
theme,
@ -665,7 +670,7 @@ where
}
impl<'a, S, Item, Message: 'a> From<InnerList<'a, S, Item, Message>>
for Element<'a, Message, crate::Renderer>
for Element<'a, Message, crate::Theme, crate::Renderer>
where
S: AsRef<str>,
Item: Clone + PartialEq,

27
src/widget/dropdown/multi/widget.rs
View file

@ -8,7 +8,7 @@ use derive_setters::Setters;
use iced_core::event::{self, Event};
use iced_core::text::{self, Paragraph, Text};
use iced_core::widget::tree::{self, Tree};
use iced_core::{alignment, keyboard, layout, mouse, overlay, renderer, svg, touch};
use iced_core::{alignment, keyboard, layout, mouse, overlay, renderer, svg, touch, Shadow};
use iced_core::{Clipboard, Layout, Length, Padding, Pixels, Rectangle, Shell, Size, Widget};
use std::ffi::OsStr;
@ -60,7 +60,7 @@ impl<'a, S: AsRef<str>, Message, Item: Clone + PartialEq + 'static> Dropdown<'a,
}
impl<'a, S: AsRef<str>, Message: 'a, Item: Clone + PartialEq + 'static>
Widget<Message, crate::Renderer> for Dropdown<'a, S, Message, Item>
Widget<Message, crate::Theme, crate::Renderer> for Dropdown<'a, S, Message, Item>
{
fn tag(&self) -> tree::Tag {
tree::Tag::of::<State<Item>>()
@ -70,12 +70,8 @@ impl<'a, S: AsRef<str>, Message: 'a, Item: Clone + PartialEq + 'static>
tree::State::new(State::<Item>::new())
}
fn width(&self) -> Length {
self.width
}
fn height(&self) -> Length {
Length::Shrink
fn size(&self) -> Size<Length> {
Size::new(self.width, Length::Shrink)
}
fn layout(
@ -188,7 +184,7 @@ impl<'a, S: AsRef<str>, Message: 'a, Item: Clone + PartialEq + 'static>
tree: &'b mut Tree,
layout: Layout<'_>,
renderer: &crate::Renderer,
) -> Option<overlay::Element<'b, Message, crate::Renderer>> {
) -> Option<overlay::Element<'b, Message, crate::Theme, crate::Renderer>> {
let state = tree.state.downcast_mut::<State<Item>>();
overlay(
@ -269,7 +265,7 @@ pub fn layout(
) -> layout::Node {
use std::f32;
let limits = limits.width(width).height(Length::Shrink).pad(padding);
let limits = limits.width(width).height(Length::Shrink).shrink(padding);
let max_width = match width {
Length::Shrink => {
@ -298,7 +294,9 @@ pub fn layout(
f32::from(text_line_height.to_absolute(Pixels(text_size))),
);
limits.resolve(intrinsic).pad(padding)
limits
.resolve(width, Length::Shrink, intrinsic)
.expand(padding)
};
layout::Node::new(size)
@ -391,7 +389,7 @@ pub fn overlay<'a, S: AsRef<str>, Message: 'a, Item: Clone + PartialEq + 'static
text_line_height: text::LineHeight,
selections: &'a super::Model<S, Item>,
on_selected: &'a dyn Fn(Item) -> Message,
) -> Option<overlay::Element<'a, Message, crate::Renderer>> {
) -> Option<overlay::Element<'a, Message, crate::Theme, crate::Renderer>> {
if state.is_open {
let description_line_height = text::LineHeight::Absolute(Pixels(
text_line_height.to_absolute(Pixels(text_size)).0 + 4.0,
@ -510,9 +508,8 @@ pub fn draw<'a, S, Item: Clone + PartialEq + 'static>(
renderer,
renderer::Quad {
bounds,
border_color: style.border_color,
border_width: style.border_width,
border_radius: style.border_radius,
border: style.border,
shadow: Shadow::default(),
},
style.background,
);