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

43
src/widget/menu/flex.rs
View file

@ -58,15 +58,15 @@ pub fn resolve<'a, E, Message, Renderer>(
tree: &mut [&mut Tree],
) -> Node
where
E: std::borrow::Borrow<Element<'a, Message, Renderer>>,
E: std::borrow::Borrow<Element<'a, Message, crate::Theme, Renderer>>,
Renderer: renderer::Renderer,
{
let limits = limits.pad(padding);
let limits = limits.shrink(padding);
let total_spacing = spacing * items.len().saturating_sub(1) as f32;
let max_cross = axis.cross(limits.max());
let mut fill_sum = 0;
let mut cross = axis.cross(limits.min()).max(axis.cross(limits.fill()));
let mut cross = axis.cross(limits.min()).max(axis.cross(Size::INFINITY));
let mut available = axis.main(limits.max()) - total_spacing;
let mut nodes: Vec<Node> = Vec::with_capacity(items.len());
@ -77,9 +77,10 @@ where
for (child, tree) in items.iter().zip(tree.iter_mut()) {
let child = child.borrow();
let c_size = child.as_widget().size();
let cross_fill_factor = match axis {
Axis::Horizontal => child.as_widget().height(),
Axis::Vertical => child.as_widget().width(),
Axis::Horizontal => c_size.height,
Axis::Vertical => c_size.width,
}
.fill_factor();
@ -100,9 +101,10 @@ where
for (i, (child, tree)) in items.iter().zip(tree.iter_mut()).enumerate() {
let child = child.borrow();
let c_size = child.as_widget().size();
let fill_factor = match axis {
Axis::Horizontal => child.as_widget().width(),
Axis::Vertical => child.as_widget().height(),
Axis::Horizontal => c_size.width,
Axis::Vertical => c_size.height,
}
.fill_factor();
@ -143,9 +145,10 @@ where
for (i, (child, tree)) in items.iter().zip(tree.iter_mut()).enumerate() {
let child = child.borrow();
let c_size = child.as_widget().size();
let fill_factor = match axis {
Axis::Horizontal => child.as_widget().width(),
Axis::Vertical => child.as_widget().height(),
Axis::Horizontal => c_size.width,
Axis::Vertical => c_size.height,
}
.fill_factor();
@ -194,24 +197,22 @@ where
let (x, y) = axis.pack(main, pad.1);
node.move_to(Point::new(x, y));
let node_ = node.clone().move_to(Point::new(x, y));
match axis {
Axis::Horizontal => {
node.align(Alignment::Start, align_items, Size::new(0.0, cross));
}
Axis::Vertical => {
node.align(align_items, Alignment::Start, Size::new(cross, 0.0));
}
}
let node_ = match axis {
Axis::Horizontal => node_.align(Alignment::Start, align_items, Size::new(0.0, cross)),
Axis::Vertical => node_.align(align_items, Alignment::Start, Size::new(cross, 0.0)),
};
let size = node.size();
let size = node_.bounds().size();
*node = node_;
main += axis.main(size);
}
let (width, height) = axis.pack(main - pad.0, cross);
let size = limits.resolve(Size::new(width, height));
let size = limits.resolve(width, height, Size::new(width, height));
Node::with_children(size.pad(padding), nodes)
Node::with_children(size.expand(padding), nodes)
}

45
src/widget/menu/menu_bar.rs
View file

@ -9,13 +9,14 @@ use super::{
};
use crate::style::menu_bar::StyleSheet;
use iced_core::Border;
use iced_widget::core::{
event,
layout::{Limits, Node},
mouse::{self, Cursor},
overlay, renderer, touch,
widget::{tree, Tree},
Alignment, Clipboard, Color, Element, Layout, Length, Padding, Rectangle, Shell, Widget,
Alignment, Clipboard, Element, Layout, Length, Padding, Rectangle, Shell, Widget,
};
pub(super) struct MenuBarState {
@ -61,7 +62,6 @@ impl Default for MenuBarState {
pub struct MenuBar<'a, Message, Renderer = crate::Renderer>
where
Renderer: renderer::Renderer,
Renderer::Theme: StyleSheet,
{
width: Length,
height: Length,
@ -75,13 +75,12 @@ where
item_height: ItemHeight,
path_highlight: Option<PathHighlight>,
menu_roots: Vec<MenuTree<'a, Message, Renderer>>,
style: <Renderer::Theme as StyleSheet>::Style,
style: <crate::Theme as StyleSheet>::Style,
}
impl<'a, Message, Renderer> MenuBar<'a, Message, Renderer>
where
Renderer: renderer::Renderer,
Renderer::Theme: StyleSheet,
{
/// Creates a new [`MenuBar`] with the given menu roots
#[must_use]
@ -106,7 +105,7 @@ where
item_height: ItemHeight::Uniform(30),
path_highlight: Some(PathHighlight::MenuActive),
menu_roots,
style: <Renderer::Theme as StyleSheet>::Style::default(),
style: <crate::Theme as StyleSheet>::Style::default(),
}
}
@ -186,7 +185,7 @@ where
/// Sets the style of the menu bar and its menus
#[must_use]
pub fn style(mut self, style: impl Into<<Renderer::Theme as StyleSheet>::Style>) -> Self {
pub fn style(mut self, style: impl Into<<crate::Theme as StyleSheet>::Style>) -> Self {
self.style = style.into();
self
}
@ -198,17 +197,13 @@ where
self
}
}
impl<'a, Message, Renderer> Widget<Message, Renderer> for MenuBar<'a, Message, Renderer>
impl<'a, Message, Renderer> Widget<Message, crate::Theme, Renderer>
for MenuBar<'a, Message, Renderer>
where
Renderer: renderer::Renderer,
Renderer::Theme: StyleSheet,
{
fn width(&self) -> Length {
self.width
}
fn height(&self) -> Length {
self.height
fn size(&self) -> iced_core::Size<Length> {
iced_core::Size::new(self.width, self.height)
}
#[allow(invalid_reference_casting)]
@ -226,8 +221,10 @@ where
.iter()
.map(|mt| {
let widget = mt.item.as_widget();
let widget_ptr = widget as *const dyn Widget<Message, Renderer>;
let widget_ptr_mut = widget_ptr as *mut dyn Widget<Message, Renderer>;
let widget_ptr =
widget as *const dyn Widget<Message, crate::Theme, Renderer>;
let widget_ptr_mut =
widget_ptr as *mut dyn Widget<Message, crate::Theme, Renderer>;
//TODO: find a way to diff_children without unsafe code
unsafe { &mut *widget_ptr_mut }
})
@ -356,7 +353,7 @@ where
&self,
tree: &Tree,
renderer: &mut Renderer,
theme: &<Renderer as renderer::Renderer>::Theme,
theme: &crate::Theme,
style: &renderer::Style,
layout: Layout<'_>,
view_cursor: Cursor,
@ -381,9 +378,11 @@ where
.bounds();
let path_quad = renderer::Quad {
bounds: active_bounds,
border_radius: styling.bar_border_radius.into(),
border_width: 0.0,
border_color: Color::TRANSPARENT,
border: Border {
radius: styling.bar_border_radius.into(),
..Default::default()
},
shadow: Default::default(),
};
let path_color = styling.path;
renderer.fill_quad(path_quad, path_color);
@ -412,7 +411,7 @@ where
tree: &'b mut Tree,
layout: Layout<'_>,
_renderer: &Renderer,
) -> Option<overlay::Element<'b, Message, Renderer>> {
) -> Option<overlay::Element<'b, Message, crate::Theme, Renderer>> {
let state = tree.state.downcast_ref::<MenuBarState>();
if !state.open {
return None;
@ -437,11 +436,11 @@ where
)
}
}
impl<'a, Message, Renderer> From<MenuBar<'a, Message, Renderer>> for Element<'a, Message, Renderer>
impl<'a, Message, Renderer> From<MenuBar<'a, Message, Renderer>>
for Element<'a, Message, crate::Theme, Renderer>
where
Message: 'a,
Renderer: 'a + renderer::Renderer,
Renderer::Theme: StyleSheet,
{
fn from(value: MenuBar<'a, Message, Renderer>) -> Self {
Self::new(value)

55
src/widget/menu/menu_inner.rs
View file

@ -4,13 +4,14 @@
use super::{menu_bar::MenuBarState, menu_tree::MenuTree};
use crate::style::menu_bar::StyleSheet;
use iced_core::{Border, Shadow};
use iced_widget::core::{
event,
layout::{Limits, Node},
mouse::{self, Cursor},
overlay, renderer, touch,
widget::Tree,
Clipboard, Color, Layout, Length, Padding, Point, Rectangle, Shell, Size, Vector,
Clipboard, Layout, Length, Padding, Point, Rectangle, Shell, Size, Vector,
};
/// The condition of when to close a menu
@ -338,18 +339,14 @@ impl MenuState {
let limits = Limits::new(Size::ZERO, size);
let mut node = mt
.item
mt.item
.as_widget()
.layout(&mut tree[mt.index], renderer, &limits);
node.move_to(Point::new(0.0, position + self.scroll_offset));
node
.layout(&mut tree[mt.index], renderer, &limits)
.move_to(Point::new(0.0, position + self.scroll_offset))
})
.collect::<Vec<_>>();
let mut node = Node::with_children(children_bounds.size(), child_nodes);
node.move_to(children_bounds.position());
node
Node::with_children(children_bounds.size(), child_nodes).move_to(children_bounds.position())
}
fn layout_single<Message, Renderer>(
@ -369,12 +366,11 @@ impl MenuState {
let position = self.menu_bounds.child_positions[index];
let limits = Limits::new(Size::ZERO, self.menu_bounds.child_sizes[index]);
let parent_offset = children_bounds.position() - Point::ORIGIN;
let mut node = menu_tree.item.as_widget().layout(tree, renderer, &limits);
node.move_to(Point::new(
let node = menu_tree.item.as_widget().layout(tree, renderer, &limits);
node.clone().move_to(Point::new(
parent_offset.x,
parent_offset.y + position + self.scroll_offset,
));
node
))
}
fn slice(
@ -434,7 +430,6 @@ impl MenuState {
pub(super) struct Menu<'a, 'b, Message, Renderer>
where
Renderer: renderer::Renderer,
Renderer::Theme: StyleSheet,
{
pub(super) tree: &'b mut Tree,
pub(super) menu_roots: &'b mut Vec<MenuTree<'a, Message, Renderer>>,
@ -447,22 +442,20 @@ where
pub(super) cross_offset: i32,
pub(super) root_bounds_list: Vec<Rectangle>,
pub(super) path_highlight: Option<PathHighlight>,
pub(super) style: &'b <Renderer::Theme as StyleSheet>::Style,
pub(super) style: &'b <crate::Theme as StyleSheet>::Style,
}
impl<'a, 'b, Message, Renderer> Menu<'a, 'b, Message, Renderer>
where
Renderer: renderer::Renderer,
Renderer::Theme: StyleSheet,
{
pub(super) fn overlay(self) -> overlay::Element<'b, Message, Renderer> {
pub(super) fn overlay(self) -> overlay::Element<'b, Message, crate::Theme, Renderer> {
overlay::Element::new(Point::ORIGIN, Box::new(self))
}
}
impl<'a, 'b, Message, Renderer> overlay::Overlay<Message, Renderer>
impl<'a, 'b, Message, Renderer> overlay::Overlay<Message, crate::Theme, Renderer>
for Menu<'a, 'b, Message, Renderer>
where
Renderer: renderer::Renderer,
Renderer::Theme: StyleSheet,
{
fn layout(
&mut self,
@ -633,7 +626,7 @@ where
fn draw(
&self,
renderer: &mut Renderer,
theme: &Renderer::Theme,
theme: &crate::Theme,
style: &renderer::Style,
layout: Layout<'_>,
view_cursor: Cursor,
@ -689,9 +682,12 @@ where
// println!("color: {:?}\n", styling.background);
let menu_quad = renderer::Quad {
bounds: pad_rectangle(children_bounds, styling.background_expand.into()),
border_radius: styling.menu_border_radius.into(),
border_width: styling.border_width,
border_color: styling.border_color,
border: Border {
radius: styling.menu_border_radius.into(),
width: styling.border_width,
color: styling.border_color,
},
shadow: Shadow::default(),
};
let menu_color = styling.background;
r.fill_quad(menu_quad, menu_color);
@ -705,9 +701,11 @@ where
.bounds();
let path_quad = renderer::Quad {
bounds: active_bounds,
border_radius: styling.menu_border_radius.into(),
border_width: 0.0,
border_color: Color::TRANSPARENT,
border: Border {
radius: styling.menu_border_radius.into(),
..Default::default()
},
shadow: Shadow::default(),
};
let path_color = styling.path;
r.fill_quad(path_quad, path_color);
@ -759,7 +757,6 @@ fn init_root_menu<Message, Renderer>(
main_offset: f32,
) where
Renderer: renderer::Renderer,
Renderer::Theme: StyleSheet,
{
let state = menu.tree.state.downcast_mut::<MenuBarState>();
if !(state.menu_states.is_empty() && bar_bounds.contains(overlay_cursor)) {
@ -896,7 +893,6 @@ fn process_overlay_events<Message, Renderer>(
) -> event::Status
where
Renderer: renderer::Renderer,
Renderer::Theme: StyleSheet,
{
use event::Status::{Captured, Ignored};
/*
@ -1086,7 +1082,6 @@ fn process_scroll_events<Message, Renderer>(
) -> event::Status
where
Renderer: renderer::Renderer,
Renderer::Theme: StyleSheet,
{
use event::Status::{Captured, Ignored};
use mouse::ScrollDelta;
@ -1186,7 +1181,7 @@ where
.iter()
.map(|mt| {
let w = mt.item.as_widget();
match w.height() {
match w.size().height {
Length::Fixed(f) => Size::new(width, f),
Length::Shrink => {
let l_height = w

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

@ -18,7 +18,7 @@ pub struct MenuTree<'a, Message, Renderer = crate::Renderer> {
pub(super) index: usize,
/// The item of the menu tree
pub(super) item: Element<'a, Message, Renderer>,
pub(super) item: Element<'a, Message, crate::Theme, Renderer>,
/// The children of the menu tree
pub(super) children: Vec<MenuTree<'a, Message, Renderer>>,
/// The width of the menu tree
@ -31,7 +31,7 @@ where
Renderer: renderer::Renderer,
{
/// Create a new menu tree from a widget
pub fn new(item: impl Into<Element<'a, Message, Renderer>>) -> Self {
pub fn new(item: impl Into<Element<'a, Message, crate::Theme, Renderer>>) -> Self {
Self {
index: 0,
item: item.into(),
@ -43,7 +43,7 @@ where
/// Create a menu tree from a widget and a vector of sub trees
pub fn with_children(
item: impl Into<Element<'a, Message, Renderer>>,
item: impl Into<Element<'a, Message, crate::Theme, Renderer>>,
children: Vec<impl Into<MenuTree<'a, Message, Renderer>>>,
) -> Self {
Self {
@ -120,11 +120,12 @@ where
}
}
impl<'a, Message, Renderer> From<Element<'a, Message, Renderer>> for MenuTree<'a, Message, Renderer>
impl<'a, Message, Renderer> From<Element<'a, Message, crate::Theme, Renderer>>
for MenuTree<'a, Message, Renderer>
where
Renderer: renderer::Renderer,
{
fn from(value: Element<'a, Message, Renderer>) -> Self {
fn from(value: Element<'a, Message, crate::Theme, Renderer>) -> Self {
Self::new(value)
}
}