me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' into virtual-widgets

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2022-03-07 15:29:43 +07:00
commit c35496d80f
No known key found for this signature in database
GPG key ID: 140CC052C94F138E
58 changed files with 446 additions and 909 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pure/src/widget/button.rs
View file

@ -8,7 +8,7 @@ use iced_native::mouse;
use iced_native::renderer;
use iced_native::widget::button;
use iced_native::{
Clipboard, Hasher, Layout, Length, Padding, Point, Rectangle, Shell,
Clipboard, Layout, Length, Padding, Point, Rectangle, Shell,
};
use iced_style::button::StyleSheet;
@ -101,16 +101,6 @@ where
self.height
}
fn hash_layout(&self, state: &mut Hasher) {
use std::hash::Hash;
self.tag().hash(state);
self.width.hash(state);
self.height.hash(state);
self.padding.hash(state);
self.content.as_widget().hash_layout(state);
}
fn layout(
&self,
renderer: &Renderer,

8
pure/src/widget/checkbox.rs
View file

@ -5,7 +5,7 @@ use iced_native::layout::{self, Layout};
use iced_native::mouse;
use iced_native::renderer;
use iced_native::text;
use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell};
use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
pub use iced_native::widget::Checkbox;
@ -88,12 +88,6 @@ where
renderer,
)
}
fn hash_layout(&self, state: &mut Hasher) {
<Self as iced_native::Widget<Message, Renderer>>::hash_layout(
self, state,
)
}
}
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>

18
pure/src/widget/column.rs
View file

@ -7,7 +7,7 @@ use iced_native::layout::{self, Layout};
use iced_native::mouse;
use iced_native::renderer;
use iced_native::{
Alignment, Clipboard, Hasher, Length, Padding, Point, Rectangle, Shell,
Alignment, Clipboard, Length, Padding, Point, Rectangle, Shell,
};
use std::u32;
@ -202,22 +202,6 @@ where
}
}
fn hash_layout(&self, state: &mut Hasher) {
use std::hash::Hash;
self.tag().hash(state);
self.width.hash(state);
self.height.hash(state);
self.max_width.hash(state);
self.align_items.hash(state);
self.spacing.hash(state);
self.padding.hash(state);
for child in &self.children {
child.as_widget().hash_layout(state);
}
}
fn overlay<'b>(
&'b self,
tree: &'b mut Tree,

18
pure/src/widget/container.rs
View file

@ -9,10 +9,9 @@ use iced_native::overlay;
use iced_native::renderer;
use iced_native::widget::container;
use iced_native::{
Clipboard, Hasher, Layout, Length, Padding, Point, Rectangle, Shell,
Clipboard, Layout, Length, Padding, Point, Rectangle, Shell,
};
use std::hash::Hash;
use std::u32;
pub use iced_style::container::{Style, StyleSheet};
@ -224,21 +223,6 @@ where
);
}
fn hash_layout(&self, state: &mut Hasher) {
struct Marker;
std::any::TypeId::of::<Marker>().hash(state);
self.padding.hash(state);
self.width.hash(state);
self.height.hash(state);
self.max_width.hash(state);
self.max_height.hash(state);
self.horizontal_alignment.hash(state);
self.vertical_alignment.hash(state);
self.content.as_widget().hash_layout(state);
}
fn overlay<'b>(
&'b self,
tree: &'b mut Tree,

6
pure/src/widget/element.rs
View file

@ -5,7 +5,7 @@ use iced_native::event::{self, Event};
use iced_native::layout::{self, Layout};
use iced_native::mouse;
use iced_native::renderer;
use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell};
use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
pub struct Element<'a, Message, Renderer> {
widget: Box<dyn Widget<Message, Renderer> + 'a>,
@ -160,8 +160,4 @@ where
renderer,
)
}
fn hash_layout(&self, state: &mut Hasher) {
self.widget.hash_layout(state);
}
}

8
pure/src/widget/image.rs
View file

@ -4,7 +4,7 @@ use crate::Element;
use iced_native::layout::{self, Layout};
use iced_native::renderer;
use iced_native::widget::image;
use iced_native::{Hasher, Length, Point, Rectangle};
use iced_native::{Length, Point, Rectangle};
use std::hash::Hash;
@ -51,12 +51,6 @@ where
viewport,
)
}
fn hash_layout(&self, state: &mut Hasher) {
<Self as iced_native::Widget<Message, Renderer>>::hash_layout(
self, state,
)
}
}
impl<'a, Message, Renderer, Handle> Into<Element<'a, Message, Renderer>>

13
pure/src/widget/pick_list.rs
View file

@ -10,7 +10,7 @@ use iced_native::renderer;
use iced_native::text;
use iced_native::widget::pick_list;
use iced_native::{
Clipboard, Hasher, Layout, Length, Padding, Point, Rectangle, Shell,
Clipboard, Layout, Length, Padding, Point, Rectangle, Shell,
};
use std::borrow::Cow;
@ -145,17 +145,6 @@ where
)
}
fn hash_layout(&self, state: &mut Hasher) {
pick_list::hash_layout(
state,
self.width,
self.padding,
self.text_size,
self.placeholder.as_ref().map(String::as_str),
&self.options,
)
}
fn on_event(
&mut self,
tree: &mut Tree,

8
pure/src/widget/radio.rs
View file

@ -5,7 +5,7 @@ use iced_native::layout::{self, Layout};
use iced_native::mouse;
use iced_native::renderer;
use iced_native::text;
use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell};
use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
pub use iced_native::widget::Radio;
@ -89,12 +89,6 @@ where
renderer,
)
}
fn hash_layout(&self, state: &mut Hasher) {
<Self as iced_native::Widget<Message, Renderer>>::hash_layout(
self, state,
)
}
}
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>

17
pure/src/widget/row.rs
View file

@ -7,7 +7,7 @@ use iced_native::layout::{self, Layout};
use iced_native::mouse;
use iced_native::renderer;
use iced_native::{
Alignment, Clipboard, Hasher, Length, Padding, Point, Rectangle, Shell,
Alignment, Clipboard, Length, Padding, Point, Rectangle, Shell,
};
pub struct Row<'a, Message, Renderer> {
@ -189,21 +189,6 @@ where
}
}
fn hash_layout(&self, state: &mut Hasher) {
use std::hash::Hash;
self.tag().hash(state);
self.width.hash(state);
self.height.hash(state);
self.align_items.hash(state);
self.spacing.hash(state);
self.padding.hash(state);
for child in &self.children {
child.as_widget().hash_layout(state);
}
}
fn overlay<'b>(
&'b self,
tree: &'b mut Tree,

10
pure/src/widget/scrollable.rs
View file

@ -7,7 +7,7 @@ use iced_native::layout::{self, Layout};
use iced_native::mouse;
use iced_native::renderer;
use iced_native::widget::scrollable;
use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell, Vector};
use iced_native::{Clipboard, Length, Point, Rectangle, Shell, Vector};
pub use iced_style::scrollable::StyleSheet;
@ -115,14 +115,6 @@ where
self.height
}
fn hash_layout(&self, state: &mut Hasher) {
use std::hash::Hash;
self.tag().hash(state);
self.height.hash(state);
self.content.as_widget().hash_layout(state)
}
fn layout(
&self,
renderer: &Renderer,

8
pure/src/widget/slider.rs
View file

@ -9,9 +9,7 @@ use iced_native::layout;
use iced_native::mouse;
use iced_native::renderer;
use iced_native::widget::slider;
use iced_native::{
Clipboard, Hasher, Layout, Length, Point, Rectangle, Shell, Size,
};
use iced_native::{Clipboard, Layout, Length, Point, Rectangle, Shell, Size};
use std::ops::RangeInclusive;
@ -230,10 +228,6 @@ where
tree.state.downcast_ref::<slider::State>(),
)
}
fn hash_layout(&self, state: &mut Hasher) {
slider::hash_layout(state, self.width)
}
}
impl<'a, T, Message, Renderer> From<Slider<'a, T, Message>>

8
pure/src/widget/space.rs
View file

@ -4,7 +4,7 @@ use iced_native::event::{self, Event};
use iced_native::layout::{self, Layout};
use iced_native::mouse;
use iced_native::renderer;
use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell};
use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
pub use iced_native::widget::Space;
@ -86,12 +86,6 @@ where
renderer,
)
}
fn hash_layout(&self, state: &mut Hasher) {
<Self as iced_native::Widget<Message, Renderer>>::hash_layout(
self, state,
)
}
}
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> for Space

8
pure/src/widget/text.rs
View file

@ -3,7 +3,7 @@ use crate::{Element, Tree, Widget};
use iced_native::layout::{self, Layout};
use iced_native::renderer;
use iced_native::text;
use iced_native::{Hasher, Length, Point, Rectangle};
use iced_native::{Length, Point, Rectangle};
pub use iced_native::widget::Text;
@ -47,12 +47,6 @@ where
viewport,
)
}
fn hash_layout(&self, state: &mut Hasher) {
<Self as iced_native::Widget<Message, Renderer>>::hash_layout(
self, state,
)
}
}
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>

8
pure/src/widget/text_input.rs
View file

@ -7,9 +7,7 @@ use iced_native::mouse;
use iced_native::renderer;
use iced_native::text;
use iced_native::widget::text_input;
use iced_native::{
Clipboard, Hasher, Length, Padding, Point, Rectangle, Shell,
};
use iced_native::{Clipboard, Length, Padding, Point, Rectangle, Shell};
pub use iced_style::text_input::StyleSheet;
@ -153,10 +151,6 @@ where
Length::Shrink
}
fn hash_layout(&self, state: &mut Hasher) {
text_input::hash_layout(state, self.width, self.padding, self.size);
}
fn layout(
&self,
renderer: &Renderer,

8
pure/src/widget/toggler.rs
View file

@ -6,7 +6,7 @@ use iced_native::layout::{self, Layout};
use iced_native::mouse;
use iced_native::renderer;
use iced_native::text;
use iced_native::{Clipboard, Hasher, Length, Point, Rectangle, Shell};
use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
pub use iced_native::widget::toggler::{Style, StyleSheet, Toggler};
@ -23,12 +23,6 @@ where
<Self as iced_native::Widget<Message, Renderer>>::height(self)
}
fn hash_layout(&self, state: &mut Hasher) {
<Self as iced_native::Widget<Message, Renderer>>::hash_layout(
self, state,
)
}
fn layout(
&self,
renderer: &Renderer,