Merge pull request #1379 from PolyMeilex/fix/clippy
Address Clippy lints
This commit is contained in:
commit
9051dd6977
113 changed files with 606 additions and 509 deletions
12
.github/workflows/lint.yml
vendored
Normal file
12
.github/workflows/lint.yml
vendored
Normal file
|
|
@ -0,0 +1,12 @@
|
||||||
|
name: Lint
|
||||||
|
on: [push, pull_request]
|
||||||
|
jobs:
|
||||||
|
all:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: hecrj/setup-rust-action@v1
|
||||||
|
with:
|
||||||
|
components: clippy
|
||||||
|
- uses: actions/checkout@master
|
||||||
|
- name: Check lints
|
||||||
|
run: cargo clippy --all --all-features --no-deps
|
||||||
1
clippy.toml
Normal file
1
clippy.toml
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
too-many-arguments-threshold = 20
|
||||||
|
|
@ -5,7 +5,7 @@ bitflags! {
|
||||||
#[derive(Default)]
|
#[derive(Default)]
|
||||||
pub struct Modifiers: u32{
|
pub struct Modifiers: u32{
|
||||||
/// The "shift" key.
|
/// The "shift" key.
|
||||||
const SHIFT = 0b100 << 0;
|
const SHIFT = 0b100;
|
||||||
// const LSHIFT = 0b010 << 0;
|
// const LSHIFT = 0b010 << 0;
|
||||||
// const RSHIFT = 0b001 << 0;
|
// const RSHIFT = 0b001 << 0;
|
||||||
//
|
//
|
||||||
|
|
|
||||||
|
|
@ -12,11 +12,18 @@
|
||||||
#![doc(
|
#![doc(
|
||||||
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
||||||
)]
|
)]
|
||||||
#![deny(missing_docs)]
|
#![deny(
|
||||||
#![deny(missing_debug_implementations)]
|
missing_debug_implementations,
|
||||||
#![deny(unused_results)]
|
missing_docs,
|
||||||
#![forbid(unsafe_code)]
|
unused_results,
|
||||||
#![forbid(rust_2018_idioms)]
|
clippy::extra_unused_lifetimes,
|
||||||
|
clippy::from_over_into,
|
||||||
|
clippy::needless_borrow,
|
||||||
|
clippy::new_without_default,
|
||||||
|
clippy::useless_conversion
|
||||||
|
)]
|
||||||
|
#![forbid(unsafe_code, rust_2018_idioms)]
|
||||||
|
#![allow(clippy::inherent_to_string, clippy::type_complexity)]
|
||||||
pub mod alignment;
|
pub mod alignment;
|
||||||
pub mod keyboard;
|
pub mod keyboard;
|
||||||
pub mod mouse;
|
pub mod mouse;
|
||||||
|
|
|
||||||
|
|
@ -84,7 +84,7 @@ impl Sandbox for ColorPalette {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Theme {
|
struct Theme {
|
||||||
lower: Vec<Color>,
|
lower: Vec<Color>,
|
||||||
base: Color,
|
base: Color,
|
||||||
higher: Vec<Color>,
|
higher: Vec<Color>,
|
||||||
|
|
|
||||||
|
|
@ -150,8 +150,7 @@ mod numeric_input {
|
||||||
self.value
|
self.value
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.map(u32::to_string)
|
.map(u32::to_string)
|
||||||
.as_ref()
|
.as_deref()
|
||||||
.map(String::as_str)
|
|
||||||
.unwrap_or(""),
|
.unwrap_or(""),
|
||||||
Event::InputChanged,
|
Event::InputChanged,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -64,12 +64,12 @@ mod circle {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> for Circle
|
impl<'a, Message, Renderer> From<Circle> for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: renderer::Renderer,
|
Renderer: renderer::Renderer,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(circle: Circle) -> Self {
|
||||||
Element::new(self)
|
Self::new(circle)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -49,7 +49,7 @@ impl Application for Example {
|
||||||
fn update(&mut self, message: Message) -> Command<Message> {
|
fn update(&mut self, message: Message) -> Command<Message> {
|
||||||
match message {
|
match message {
|
||||||
Message::Add => {
|
Message::Add => {
|
||||||
self.last_id = self.last_id + 1;
|
self.last_id += 1;
|
||||||
|
|
||||||
self.downloads.push(Download::new(self.last_id));
|
self.downloads.push(Download::new(self.last_id));
|
||||||
}
|
}
|
||||||
|
|
@ -134,8 +134,8 @@ impl Download {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn progress(&mut self, new_progress: download::Progress) {
|
pub fn progress(&mut self, new_progress: download::Progress) {
|
||||||
match &mut self.state {
|
if let State::Downloading { progress } = &mut self.state {
|
||||||
State::Downloading { progress } => match new_progress {
|
match new_progress {
|
||||||
download::Progress::Started => {
|
download::Progress::Started => {
|
||||||
*progress = 0.0;
|
*progress = 0.0;
|
||||||
}
|
}
|
||||||
|
|
@ -152,8 +152,7 @@ impl Download {
|
||||||
button: button::State::new(),
|
button: button::State::new(),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
},
|
}
|
||||||
_ => {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -280,7 +280,7 @@ mod grid {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn view<'a>(&'a mut self) -> Element<'a, Message> {
|
pub fn view(&mut self) -> Element<Message> {
|
||||||
Canvas::new(self)
|
Canvas::new(self)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.height(Length::Fill)
|
.height(Length::Fill)
|
||||||
|
|
@ -328,7 +328,7 @@ mod grid {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a> canvas::Program<Message> for Grid {
|
impl canvas::Program<Message> for Grid {
|
||||||
fn update(
|
fn update(
|
||||||
&mut self,
|
&mut self,
|
||||||
event: Event,
|
event: Event,
|
||||||
|
|
@ -826,13 +826,13 @@ struct Controls {
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Controls {
|
impl Controls {
|
||||||
fn view<'a>(
|
fn view(
|
||||||
&'a mut self,
|
&mut self,
|
||||||
is_playing: bool,
|
is_playing: bool,
|
||||||
is_grid_enabled: bool,
|
is_grid_enabled: bool,
|
||||||
speed: usize,
|
speed: usize,
|
||||||
preset: Preset,
|
preset: Preset,
|
||||||
) -> Element<'a, Message> {
|
) -> Element<Message> {
|
||||||
let playback_controls = Row::new()
|
let playback_controls = Row::new()
|
||||||
.spacing(10)
|
.spacing(10)
|
||||||
.push(
|
.push(
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
pub enum Preset {
|
pub enum Preset {
|
||||||
Custom,
|
Custom,
|
||||||
XKCD,
|
Xkcd,
|
||||||
Glider,
|
Glider,
|
||||||
SmallExploder,
|
SmallExploder,
|
||||||
Exploder,
|
Exploder,
|
||||||
|
|
@ -14,7 +14,7 @@ pub enum Preset {
|
||||||
|
|
||||||
pub static ALL: &[Preset] = &[
|
pub static ALL: &[Preset] = &[
|
||||||
Preset::Custom,
|
Preset::Custom,
|
||||||
Preset::XKCD,
|
Preset::Xkcd,
|
||||||
Preset::Glider,
|
Preset::Glider,
|
||||||
Preset::SmallExploder,
|
Preset::SmallExploder,
|
||||||
Preset::Exploder,
|
Preset::Exploder,
|
||||||
|
|
@ -30,7 +30,7 @@ impl Preset {
|
||||||
#[rustfmt::skip]
|
#[rustfmt::skip]
|
||||||
let cells = match self {
|
let cells = match self {
|
||||||
Preset::Custom => vec![],
|
Preset::Custom => vec![],
|
||||||
Preset::XKCD => vec![
|
Preset::Xkcd => vec![
|
||||||
" xxx ",
|
" xxx ",
|
||||||
" x x ",
|
" x x ",
|
||||||
" x x ",
|
" x x ",
|
||||||
|
|
@ -116,7 +116,7 @@ impl Preset {
|
||||||
|
|
||||||
impl Default for Preset {
|
impl Default for Preset {
|
||||||
fn default() -> Preset {
|
fn default() -> Preset {
|
||||||
Preset::XKCD
|
Preset::Xkcd
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -127,7 +127,7 @@ impl std::fmt::Display for Preset {
|
||||||
"{}",
|
"{}",
|
||||||
match self {
|
match self {
|
||||||
Preset::Custom => "Custom",
|
Preset::Custom => "Custom",
|
||||||
Preset::XKCD => "xkcd #2293",
|
Preset::Xkcd => "xkcd #2293",
|
||||||
Preset::Glider => "Glider",
|
Preset::Glider => "Glider",
|
||||||
Preset::SmallExploder => "Small Exploder",
|
Preset::SmallExploder => "Small Exploder",
|
||||||
Preset::Exploder => "Exploder",
|
Preset::Exploder => "Exploder",
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ mod rainbow {
|
||||||
layout, Element, Layout, Length, Point, Rectangle, Size, Vector, Widget,
|
layout, Element, Layout, Length, Point, Rectangle, Size, Vector, Widget,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#[derive(Default)]
|
||||||
pub struct Rainbow;
|
pub struct Rainbow;
|
||||||
|
|
||||||
impl Rainbow {
|
impl Rainbow {
|
||||||
|
|
@ -148,12 +149,12 @@ mod rainbow {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, B, T> Into<Element<'a, Message, Renderer<B, T>>> for Rainbow
|
impl<'a, Message, B, T> From<Rainbow> for Element<'a, Message, Renderer<B, T>>
|
||||||
where
|
where
|
||||||
B: Backend,
|
B: Backend,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer<B, T>> {
|
fn from(rainbow: Rainbow) -> Self {
|
||||||
Element::new(self)
|
Self::new(rainbow)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -58,7 +58,7 @@ pub fn main() {
|
||||||
|
|
||||||
let mut cursor_position = PhysicalPosition::new(-1.0, -1.0);
|
let mut cursor_position = PhysicalPosition::new(-1.0, -1.0);
|
||||||
let mut modifiers = ModifiersState::default();
|
let mut modifiers = ModifiersState::default();
|
||||||
let mut clipboard = Clipboard::connect(&windowed_context.window());
|
let mut clipboard = Clipboard::connect(windowed_context.window());
|
||||||
|
|
||||||
let mut renderer = Renderer::new(Backend::new(&gl, Settings::default()));
|
let mut renderer = Renderer::new(Backend::new(&gl, Settings::default()));
|
||||||
|
|
||||||
|
|
@ -73,13 +73,12 @@ pub fn main() {
|
||||||
);
|
);
|
||||||
let mut resized = false;
|
let mut resized = false;
|
||||||
|
|
||||||
let scene = Scene::new(&gl, &shader_version);
|
let scene = Scene::new(&gl, shader_version);
|
||||||
|
|
||||||
event_loop.run(move |event, _, control_flow| {
|
event_loop.run(move |event, _, control_flow| {
|
||||||
*control_flow = ControlFlow::Wait;
|
*control_flow = ControlFlow::Wait;
|
||||||
|
|
||||||
match event {
|
match event {
|
||||||
Event::LoopDestroyed => return,
|
|
||||||
Event::WindowEvent { event, .. } => {
|
Event::WindowEvent { event, .. } => {
|
||||||
match event {
|
match event {
|
||||||
WindowEvent::CursorMoved { position, .. } => {
|
WindowEvent::CursorMoved { position, .. } => {
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ impl Program for Controls {
|
||||||
t,
|
t,
|
||||||
"Placeholder",
|
"Placeholder",
|
||||||
text,
|
text,
|
||||||
move |text| Message::TextChanged(text),
|
Message::TextChanged,
|
||||||
)),
|
)),
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ pub fn main() {
|
||||||
let instance = wgpu::Instance::new(backend);
|
let instance = wgpu::Instance::new(backend);
|
||||||
let surface = unsafe { instance.create_surface(&window) };
|
let surface = unsafe { instance.create_surface(&window) };
|
||||||
|
|
||||||
let (format, (mut device, queue)) = futures::executor::block_on(async {
|
let (format, (device, queue)) = futures::executor::block_on(async {
|
||||||
let adapter = wgpu::util::initialize_adapter_from_env_or_default(
|
let adapter = wgpu::util::initialize_adapter_from_env_or_default(
|
||||||
&instance,
|
&instance,
|
||||||
backend,
|
backend,
|
||||||
|
|
@ -128,13 +128,13 @@ pub fn main() {
|
||||||
let mut staging_belt = wgpu::util::StagingBelt::new(5 * 1024);
|
let mut staging_belt = wgpu::util::StagingBelt::new(5 * 1024);
|
||||||
|
|
||||||
// Initialize scene and GUI controls
|
// Initialize scene and GUI controls
|
||||||
let scene = Scene::new(&mut device, format);
|
let scene = Scene::new(&device, format);
|
||||||
let controls = Controls::new();
|
let controls = Controls::new();
|
||||||
|
|
||||||
// Initialize iced
|
// Initialize iced
|
||||||
let mut debug = Debug::new();
|
let mut debug = Debug::new();
|
||||||
let mut renderer =
|
let mut renderer =
|
||||||
Renderer::new(Backend::new(&mut device, Settings::default(), format));
|
Renderer::new(Backend::new(&device, Settings::default(), format));
|
||||||
|
|
||||||
let mut state = program::State::new(
|
let mut state = program::State::new(
|
||||||
controls,
|
controls,
|
||||||
|
|
@ -208,8 +208,8 @@ pub fn main() {
|
||||||
surface.configure(
|
surface.configure(
|
||||||
&device,
|
&device,
|
||||||
&wgpu::SurfaceConfiguration {
|
&wgpu::SurfaceConfiguration {
|
||||||
|
format,
|
||||||
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
|
usage: wgpu::TextureUsages::RENDER_ATTACHMENT,
|
||||||
format: format,
|
|
||||||
width: size.width,
|
width: size.width,
|
||||||
height: size.height,
|
height: size.height,
|
||||||
present_mode: wgpu::PresentMode::AutoVsync,
|
present_mode: wgpu::PresentMode::AutoVsync,
|
||||||
|
|
@ -244,7 +244,7 @@ pub fn main() {
|
||||||
// And then iced on top
|
// And then iced on top
|
||||||
renderer.with_primitives(|backend, primitive| {
|
renderer.with_primitives(|backend, primitive| {
|
||||||
backend.present(
|
backend.present(
|
||||||
&mut device,
|
&device,
|
||||||
&mut staging_belt,
|
&mut staging_belt,
|
||||||
&mut encoder,
|
&mut encoder,
|
||||||
&view,
|
&view,
|
||||||
|
|
|
||||||
|
|
@ -66,40 +66,37 @@ fn build_pipeline(
|
||||||
bind_group_layouts: &[],
|
bind_group_layouts: &[],
|
||||||
});
|
});
|
||||||
|
|
||||||
let pipeline =
|
device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
|
||||||
device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
|
label: None,
|
||||||
label: None,
|
layout: Some(&pipeline_layout),
|
||||||
layout: Some(&pipeline_layout),
|
vertex: wgpu::VertexState {
|
||||||
vertex: wgpu::VertexState {
|
module: &vs_module,
|
||||||
module: &vs_module,
|
entry_point: "main",
|
||||||
entry_point: "main",
|
buffers: &[],
|
||||||
buffers: &[],
|
},
|
||||||
},
|
fragment: Some(wgpu::FragmentState {
|
||||||
fragment: Some(wgpu::FragmentState {
|
module: &fs_module,
|
||||||
module: &fs_module,
|
entry_point: "main",
|
||||||
entry_point: "main",
|
targets: &[Some(wgpu::ColorTargetState {
|
||||||
targets: &[Some(wgpu::ColorTargetState {
|
format: texture_format,
|
||||||
format: texture_format,
|
blend: Some(wgpu::BlendState {
|
||||||
blend: Some(wgpu::BlendState {
|
color: wgpu::BlendComponent::REPLACE,
|
||||||
color: wgpu::BlendComponent::REPLACE,
|
alpha: wgpu::BlendComponent::REPLACE,
|
||||||
alpha: wgpu::BlendComponent::REPLACE,
|
}),
|
||||||
}),
|
write_mask: wgpu::ColorWrites::ALL,
|
||||||
write_mask: wgpu::ColorWrites::ALL,
|
})],
|
||||||
})],
|
}),
|
||||||
}),
|
primitive: wgpu::PrimitiveState {
|
||||||
primitive: wgpu::PrimitiveState {
|
topology: wgpu::PrimitiveTopology::TriangleList,
|
||||||
topology: wgpu::PrimitiveTopology::TriangleList,
|
front_face: wgpu::FrontFace::Ccw,
|
||||||
front_face: wgpu::FrontFace::Ccw,
|
..Default::default()
|
||||||
..Default::default()
|
},
|
||||||
},
|
depth_stencil: None,
|
||||||
depth_stencil: None,
|
multisample: wgpu::MultisampleState {
|
||||||
multisample: wgpu::MultisampleState {
|
count: 1,
|
||||||
count: 1,
|
mask: !0,
|
||||||
mask: !0,
|
alpha_to_coverage_enabled: false,
|
||||||
alpha_to_coverage_enabled: false,
|
},
|
||||||
},
|
multiview: None,
|
||||||
multiview: None,
|
})
|
||||||
});
|
|
||||||
|
|
||||||
pipeline
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -192,8 +192,7 @@ impl Pokemon {
|
||||||
let description = entry
|
let description = entry
|
||||||
.flavor_text_entries
|
.flavor_text_entries
|
||||||
.iter()
|
.iter()
|
||||||
.filter(|text| text.language.name == "en")
|
.find(|text| text.language.name == "en")
|
||||||
.next()
|
|
||||||
.ok_or(Error::LanguageError)?;
|
.ok_or(Error::LanguageError)?;
|
||||||
|
|
||||||
Ok(Pokemon {
|
Ok(Pokemon {
|
||||||
|
|
|
||||||
|
|
@ -143,8 +143,7 @@ mod numeric_input {
|
||||||
self.value
|
self.value
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.map(u32::to_string)
|
.map(u32::to_string)
|
||||||
.as_ref()
|
.as_deref()
|
||||||
.map(String::as_str)
|
|
||||||
.unwrap_or(""),
|
.unwrap_or(""),
|
||||||
Event::InputChanged,
|
Event::InputChanged,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -350,7 +350,7 @@ mod grid {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn view<'a>(&'a self) -> Element<'a, Message> {
|
pub fn view(&self) -> Element<Message> {
|
||||||
Canvas::new(self)
|
Canvas::new(self)
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.height(Length::Fill)
|
.height(Length::Fill)
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
pub enum Preset {
|
pub enum Preset {
|
||||||
Custom,
|
Custom,
|
||||||
XKCD,
|
Xkcd,
|
||||||
Glider,
|
Glider,
|
||||||
SmallExploder,
|
SmallExploder,
|
||||||
Exploder,
|
Exploder,
|
||||||
|
|
@ -14,7 +14,7 @@ pub enum Preset {
|
||||||
|
|
||||||
pub static ALL: &[Preset] = &[
|
pub static ALL: &[Preset] = &[
|
||||||
Preset::Custom,
|
Preset::Custom,
|
||||||
Preset::XKCD,
|
Preset::Xkcd,
|
||||||
Preset::Glider,
|
Preset::Glider,
|
||||||
Preset::SmallExploder,
|
Preset::SmallExploder,
|
||||||
Preset::Exploder,
|
Preset::Exploder,
|
||||||
|
|
@ -30,7 +30,7 @@ impl Preset {
|
||||||
#[rustfmt::skip]
|
#[rustfmt::skip]
|
||||||
let cells = match self {
|
let cells = match self {
|
||||||
Preset::Custom => vec![],
|
Preset::Custom => vec![],
|
||||||
Preset::XKCD => vec![
|
Preset::Xkcd => vec![
|
||||||
" xxx ",
|
" xxx ",
|
||||||
" x x ",
|
" x x ",
|
||||||
" x x ",
|
" x x ",
|
||||||
|
|
@ -116,7 +116,7 @@ impl Preset {
|
||||||
|
|
||||||
impl Default for Preset {
|
impl Default for Preset {
|
||||||
fn default() -> Preset {
|
fn default() -> Preset {
|
||||||
Preset::XKCD
|
Preset::Xkcd
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -127,7 +127,7 @@ impl std::fmt::Display for Preset {
|
||||||
"{}",
|
"{}",
|
||||||
match self {
|
match self {
|
||||||
Preset::Custom => "Custom",
|
Preset::Custom => "Custom",
|
||||||
Preset::XKCD => "xkcd #2293",
|
Preset::Xkcd => "xkcd #2293",
|
||||||
Preset::Glider => "Glider",
|
Preset::Glider => "Glider",
|
||||||
Preset::SmallExploder => "Small Exploder",
|
Preset::SmallExploder => "Small Exploder",
|
||||||
Preset::Exploder => "Exploder",
|
Preset::Exploder => "Exploder",
|
||||||
|
|
|
||||||
|
|
@ -167,7 +167,7 @@ impl Application for Todos {
|
||||||
.size(30)
|
.size(30)
|
||||||
.on_submit(Message::CreateTask);
|
.on_submit(Message::CreateTask);
|
||||||
|
|
||||||
let controls = view_controls(&tasks, *filter);
|
let controls = view_controls(tasks, *filter);
|
||||||
let filtered_tasks =
|
let filtered_tasks =
|
||||||
tasks.iter().filter(|task| filter.matches(task));
|
tasks.iter().filter(|task| filter.matches(task));
|
||||||
|
|
||||||
|
|
@ -446,15 +446,15 @@ struct SavedState {
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
enum LoadError {
|
enum LoadError {
|
||||||
FileError,
|
File,
|
||||||
FormatError,
|
Format,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
enum SaveError {
|
enum SaveError {
|
||||||
FileError,
|
File,
|
||||||
WriteError,
|
Write,
|
||||||
FormatError,
|
Format,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
|
|
@ -465,7 +465,7 @@ impl SavedState {
|
||||||
{
|
{
|
||||||
project_dirs.data_dir().into()
|
project_dirs.data_dir().into()
|
||||||
} else {
|
} else {
|
||||||
std::env::current_dir().unwrap_or(std::path::PathBuf::new())
|
std::env::current_dir().unwrap_or_default()
|
||||||
};
|
};
|
||||||
|
|
||||||
path.push("todos.json");
|
path.push("todos.json");
|
||||||
|
|
@ -480,37 +480,37 @@ impl SavedState {
|
||||||
|
|
||||||
let mut file = async_std::fs::File::open(Self::path())
|
let mut file = async_std::fs::File::open(Self::path())
|
||||||
.await
|
.await
|
||||||
.map_err(|_| LoadError::FileError)?;
|
.map_err(|_| LoadError::File)?;
|
||||||
|
|
||||||
file.read_to_string(&mut contents)
|
file.read_to_string(&mut contents)
|
||||||
.await
|
.await
|
||||||
.map_err(|_| LoadError::FileError)?;
|
.map_err(|_| LoadError::File)?;
|
||||||
|
|
||||||
serde_json::from_str(&contents).map_err(|_| LoadError::FormatError)
|
serde_json::from_str(&contents).map_err(|_| LoadError::Format)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn save(self) -> Result<(), SaveError> {
|
async fn save(self) -> Result<(), SaveError> {
|
||||||
use async_std::prelude::*;
|
use async_std::prelude::*;
|
||||||
|
|
||||||
let json = serde_json::to_string_pretty(&self)
|
let json = serde_json::to_string_pretty(&self)
|
||||||
.map_err(|_| SaveError::FormatError)?;
|
.map_err(|_| SaveError::Format)?;
|
||||||
|
|
||||||
let path = Self::path();
|
let path = Self::path();
|
||||||
|
|
||||||
if let Some(dir) = path.parent() {
|
if let Some(dir) = path.parent() {
|
||||||
async_std::fs::create_dir_all(dir)
|
async_std::fs::create_dir_all(dir)
|
||||||
.await
|
.await
|
||||||
.map_err(|_| SaveError::FileError)?;
|
.map_err(|_| SaveError::File)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
let mut file = async_std::fs::File::create(path)
|
let mut file = async_std::fs::File::create(path)
|
||||||
.await
|
.await
|
||||||
.map_err(|_| SaveError::FileError)?;
|
.map_err(|_| SaveError::File)?;
|
||||||
|
|
||||||
file.write_all(json.as_bytes())
|
file.write_all(json.as_bytes())
|
||||||
.await
|
.await
|
||||||
.map_err(|_| SaveError::WriteError)?;
|
.map_err(|_| SaveError::Write)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is a simple way to save at most once every couple seconds
|
// This is a simple way to save at most once every couple seconds
|
||||||
|
|
@ -529,25 +529,25 @@ impl SavedState {
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn load() -> Result<SavedState, LoadError> {
|
async fn load() -> Result<SavedState, LoadError> {
|
||||||
let storage = Self::storage().ok_or(LoadError::FileError)?;
|
let storage = Self::storage().ok_or(LoadError::File)?;
|
||||||
|
|
||||||
let contents = storage
|
let contents = storage
|
||||||
.get_item("state")
|
.get_item("state")
|
||||||
.map_err(|_| LoadError::FileError)?
|
.map_err(|_| LoadError::File)?
|
||||||
.ok_or(LoadError::FileError)?;
|
.ok_or(LoadError::File)?;
|
||||||
|
|
||||||
serde_json::from_str(&contents).map_err(|_| LoadError::FormatError)
|
serde_json::from_str(&contents).map_err(|_| LoadError::Format)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn save(self) -> Result<(), SaveError> {
|
async fn save(self) -> Result<(), SaveError> {
|
||||||
let storage = Self::storage().ok_or(SaveError::FileError)?;
|
let storage = Self::storage().ok_or(SaveError::File)?;
|
||||||
|
|
||||||
let json = serde_json::to_string_pretty(&self)
|
let json = serde_json::to_string_pretty(&self)
|
||||||
.map_err(|_| SaveError::FormatError)?;
|
.map_err(|_| SaveError::Format)?;
|
||||||
|
|
||||||
storage
|
storage
|
||||||
.set_item("state", &json)
|
.set_item("state", &json)
|
||||||
.map_err(|_| SaveError::WriteError)?;
|
.map_err(|_| SaveError::Write)?;
|
||||||
|
|
||||||
let _ = wasm_timer::Delay::new(std::time::Duration::from_secs(2)).await;
|
let _ = wasm_timer::Delay::new(std::time::Duration::from_secs(2)).await;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -78,14 +78,6 @@ impl Sandbox for Tour {
|
||||||
.push(controls)
|
.push(controls)
|
||||||
.into();
|
.into();
|
||||||
|
|
||||||
let content = if self.debug {
|
|
||||||
// TODO
|
|
||||||
//content.explain(Color::BLACK)
|
|
||||||
content
|
|
||||||
} else {
|
|
||||||
content
|
|
||||||
};
|
|
||||||
|
|
||||||
let scrollable =
|
let scrollable =
|
||||||
scrollable(container(content).width(Length::Fill).center_x());
|
scrollable(container(content).width(Length::Fill).center_x());
|
||||||
|
|
||||||
|
|
@ -494,7 +486,7 @@ impl<'a> Step {
|
||||||
.push(ferris(width))
|
.push(ferris(width))
|
||||||
.push(slider(100..=500, width, StepMessage::ImageWidthChanged))
|
.push(slider(100..=500, width, StepMessage::ImageWidthChanged))
|
||||||
.push(
|
.push(
|
||||||
text(format!("Width: {} px", width.to_string()))
|
text(format!("Width: {} px", width))
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.horizontal_alignment(alignment::Horizontal::Center),
|
.horizontal_alignment(alignment::Horizontal::Center),
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -65,8 +65,7 @@ impl Application for SolarSystem {
|
||||||
}
|
}
|
||||||
|
|
||||||
fn subscription(&self) -> Subscription<Message> {
|
fn subscription(&self) -> Subscription<Message> {
|
||||||
time::every(std::time::Duration::from_millis(10))
|
time::every(std::time::Duration::from_millis(10)).map(Message::Tick)
|
||||||
.map(|instant| Message::Tick(instant))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn view(&mut self) -> Element<Message> {
|
fn view(&mut self) -> Element<Message> {
|
||||||
|
|
|
||||||
|
|
@ -67,13 +67,12 @@ impl Application for Stopwatch {
|
||||||
self.state = State::Idle;
|
self.state = State::Idle;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
Message::Tick(now) => match &mut self.state {
|
Message::Tick(now) => {
|
||||||
State::Ticking { last_tick } => {
|
if let State::Ticking { last_tick } = &mut self.state {
|
||||||
self.duration += now - *last_tick;
|
self.duration += now - *last_tick;
|
||||||
*last_tick = now;
|
*last_tick = now;
|
||||||
}
|
}
|
||||||
_ => {}
|
}
|
||||||
},
|
|
||||||
Message::Reset => {
|
Message::Reset => {
|
||||||
self.duration = Duration::default();
|
self.duration = Duration::default();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -107,11 +107,8 @@ impl Application for Example {
|
||||||
ByteSize::kb(information.memory_total).to_string();
|
ByteSize::kb(information.memory_total).to_string();
|
||||||
|
|
||||||
let memory_total = Text::new(format!(
|
let memory_total = Text::new(format!(
|
||||||
"Memory (total): {}",
|
"Memory (total): {} kb ({})",
|
||||||
format!(
|
information.memory_total, memory_readable
|
||||||
"{} kb ({})",
|
|
||||||
information.memory_total, memory_readable
|
|
||||||
)
|
|
||||||
));
|
));
|
||||||
|
|
||||||
let memory_text = if let Some(memory_used) =
|
let memory_text = if let Some(memory_used) =
|
||||||
|
|
|
||||||
|
|
@ -168,7 +168,7 @@ impl Application for Todos {
|
||||||
.size(30)
|
.size(30)
|
||||||
.on_submit(Message::CreateTask);
|
.on_submit(Message::CreateTask);
|
||||||
|
|
||||||
let controls = controls.view(&tasks, *filter);
|
let controls = controls.view(tasks, *filter);
|
||||||
let filtered_tasks =
|
let filtered_tasks =
|
||||||
tasks.iter().filter(|task| filter.matches(task));
|
tasks.iter().filter(|task| filter.matches(task));
|
||||||
|
|
||||||
|
|
@ -493,15 +493,15 @@ struct SavedState {
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
enum LoadError {
|
enum LoadError {
|
||||||
FileError,
|
File,
|
||||||
FormatError,
|
Format,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
enum SaveError {
|
enum SaveError {
|
||||||
FileError,
|
File,
|
||||||
WriteError,
|
Write,
|
||||||
FormatError,
|
Format,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
|
|
@ -512,7 +512,7 @@ impl SavedState {
|
||||||
{
|
{
|
||||||
project_dirs.data_dir().into()
|
project_dirs.data_dir().into()
|
||||||
} else {
|
} else {
|
||||||
std::env::current_dir().unwrap_or(std::path::PathBuf::new())
|
std::env::current_dir().unwrap_or_default()
|
||||||
};
|
};
|
||||||
|
|
||||||
path.push("todos.json");
|
path.push("todos.json");
|
||||||
|
|
@ -527,37 +527,37 @@ impl SavedState {
|
||||||
|
|
||||||
let mut file = async_std::fs::File::open(Self::path())
|
let mut file = async_std::fs::File::open(Self::path())
|
||||||
.await
|
.await
|
||||||
.map_err(|_| LoadError::FileError)?;
|
.map_err(|_| LoadError::File)?;
|
||||||
|
|
||||||
file.read_to_string(&mut contents)
|
file.read_to_string(&mut contents)
|
||||||
.await
|
.await
|
||||||
.map_err(|_| LoadError::FileError)?;
|
.map_err(|_| LoadError::File)?;
|
||||||
|
|
||||||
serde_json::from_str(&contents).map_err(|_| LoadError::FormatError)
|
serde_json::from_str(&contents).map_err(|_| LoadError::Format)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn save(self) -> Result<(), SaveError> {
|
async fn save(self) -> Result<(), SaveError> {
|
||||||
use async_std::prelude::*;
|
use async_std::prelude::*;
|
||||||
|
|
||||||
let json = serde_json::to_string_pretty(&self)
|
let json = serde_json::to_string_pretty(&self)
|
||||||
.map_err(|_| SaveError::FormatError)?;
|
.map_err(|_| SaveError::Format)?;
|
||||||
|
|
||||||
let path = Self::path();
|
let path = Self::path();
|
||||||
|
|
||||||
if let Some(dir) = path.parent() {
|
if let Some(dir) = path.parent() {
|
||||||
async_std::fs::create_dir_all(dir)
|
async_std::fs::create_dir_all(dir)
|
||||||
.await
|
.await
|
||||||
.map_err(|_| SaveError::FileError)?;
|
.map_err(|_| SaveError::File)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
let mut file = async_std::fs::File::create(path)
|
let mut file = async_std::fs::File::create(path)
|
||||||
.await
|
.await
|
||||||
.map_err(|_| SaveError::FileError)?;
|
.map_err(|_| SaveError::File)?;
|
||||||
|
|
||||||
file.write_all(json.as_bytes())
|
file.write_all(json.as_bytes())
|
||||||
.await
|
.await
|
||||||
.map_err(|_| SaveError::WriteError)?;
|
.map_err(|_| SaveError::Write)?;
|
||||||
}
|
}
|
||||||
|
|
||||||
// This is a simple way to save at most once every couple seconds
|
// This is a simple way to save at most once every couple seconds
|
||||||
|
|
@ -576,25 +576,25 @@ impl SavedState {
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn load() -> Result<SavedState, LoadError> {
|
async fn load() -> Result<SavedState, LoadError> {
|
||||||
let storage = Self::storage().ok_or(LoadError::FileError)?;
|
let storage = Self::storage().ok_or(LoadError::File)?;
|
||||||
|
|
||||||
let contents = storage
|
let contents = storage
|
||||||
.get_item("state")
|
.get_item("state")
|
||||||
.map_err(|_| LoadError::FileError)?
|
.map_err(|_| LoadError::File)?
|
||||||
.ok_or(LoadError::FileError)?;
|
.ok_or(LoadError::File)?;
|
||||||
|
|
||||||
serde_json::from_str(&contents).map_err(|_| LoadError::FormatError)
|
serde_json::from_str(&contents).map_err(|_| LoadError::Format)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn save(self) -> Result<(), SaveError> {
|
async fn save(self) -> Result<(), SaveError> {
|
||||||
let storage = Self::storage().ok_or(SaveError::FileError)?;
|
let storage = Self::storage().ok_or(SaveError::File)?;
|
||||||
|
|
||||||
let json = serde_json::to_string_pretty(&self)
|
let json = serde_json::to_string_pretty(&self)
|
||||||
.map_err(|_| SaveError::FormatError)?;
|
.map_err(|_| SaveError::Format)?;
|
||||||
|
|
||||||
storage
|
storage
|
||||||
.set_item("state", &json)
|
.set_item("state", &json)
|
||||||
.map_err(|_| SaveError::WriteError)?;
|
.map_err(|_| SaveError::Write)?;
|
||||||
|
|
||||||
let _ = wasm_timer::Delay::new(std::time::Duration::from_secs(2)).await;
|
let _ = wasm_timer::Delay::new(std::time::Duration::from_secs(2)).await;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -54,16 +54,11 @@ impl Sandbox for Example {
|
||||||
tooltip::Position::Right,
|
tooltip::Position::Right,
|
||||||
);
|
);
|
||||||
|
|
||||||
let fixed_tooltips = Row::with_children(vec![
|
let fixed_tooltips = Row::with_children(vec![top, bottom, left, right])
|
||||||
top.into(),
|
.width(Length::Fill)
|
||||||
bottom.into(),
|
.height(Length::Fill)
|
||||||
left.into(),
|
.align_items(Alignment::Center)
|
||||||
right.into(),
|
.spacing(50);
|
||||||
])
|
|
||||||
.width(Length::Fill)
|
|
||||||
.height(Length::Fill)
|
|
||||||
.align_items(Alignment::Center)
|
|
||||||
.spacing(50);
|
|
||||||
|
|
||||||
let follow_cursor = tooltip(
|
let follow_cursor = tooltip(
|
||||||
"Tooltip follows cursor",
|
"Tooltip follows cursor",
|
||||||
|
|
@ -78,7 +73,7 @@ impl Sandbox for Example {
|
||||||
.center_x()
|
.center_x()
|
||||||
.center_y()
|
.center_y()
|
||||||
.into(),
|
.into(),
|
||||||
follow_cursor.into(),
|
follow_cursor,
|
||||||
])
|
])
|
||||||
.width(Length::Fill)
|
.width(Length::Fill)
|
||||||
.height(Length::Fill)
|
.height(Length::Fill)
|
||||||
|
|
|
||||||
|
|
@ -57,7 +57,7 @@ impl Application for App {
|
||||||
|
|
||||||
fn view(&mut self) -> Element<Message> {
|
fn view(&mut self) -> Element<Message> {
|
||||||
let content = match &self.url {
|
let content = match &self.url {
|
||||||
Some(url) => Text::new(format!("{}", url)),
|
Some(url) => Text::new(url),
|
||||||
None => Text::new("No URL received yet!"),
|
None => Text::new("No URL received yet!"),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ pub fn connect() -> Subscription<Event> {
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
Err(_) => {
|
Err(_) => {
|
||||||
let _ = tokio::time::sleep(
|
tokio::time::sleep(
|
||||||
tokio::time::Duration::from_secs(1),
|
tokio::time::Duration::from_secs(1),
|
||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
|
|
@ -79,6 +79,7 @@ pub fn connect() -> Subscription<Event> {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
#[allow(clippy::large_enum_variant)]
|
||||||
enum State {
|
enum State {
|
||||||
Disconnected,
|
Disconnected,
|
||||||
Connected(
|
Connected(
|
||||||
|
|
@ -101,8 +102,7 @@ pub struct Connection(mpsc::Sender<Message>);
|
||||||
|
|
||||||
impl Connection {
|
impl Connection {
|
||||||
pub fn send(&mut self, message: Message) {
|
pub fn send(&mut self, message: Message) {
|
||||||
let _ = self
|
self.0
|
||||||
.0
|
|
||||||
.try_send(message)
|
.try_send(message)
|
||||||
.expect("Send message to echo server");
|
.expect("Send message to echo server");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -27,9 +27,9 @@ use warp::Filter;
|
||||||
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
// THE SOFTWARE.
|
// THE SOFTWARE.
|
||||||
pub async fn run() {
|
pub async fn run() {
|
||||||
let routes = warp::path::end().and(warp::ws()).map(|ws: warp::ws::Ws| {
|
let routes = warp::path::end()
|
||||||
ws.on_upgrade(move |socket| user_connected(socket))
|
.and(warp::ws())
|
||||||
});
|
.map(|ws: warp::ws::Ws| ws.on_upgrade(user_connected));
|
||||||
|
|
||||||
warp::serve(routes).run(([127, 0, 0, 1], 3030)).await;
|
warp::serve(routes).run(([127, 0, 0, 1], 3030)).await;
|
||||||
}
|
}
|
||||||
|
|
@ -40,7 +40,7 @@ async fn user_connected(ws: WebSocket) {
|
||||||
|
|
||||||
tokio::task::spawn(async move {
|
tokio::task::spawn(async move {
|
||||||
while let Some(message) = rx.next().await {
|
while let Some(message) = rx.next().await {
|
||||||
let _ = user_ws_tx.send(message).await.unwrap_or_else(|e| {
|
user_ws_tx.send(message).await.unwrap_or_else(|e| {
|
||||||
eprintln!("websocket send error: {}", e);
|
eprintln!("websocket send error: {}", e);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -4,13 +4,19 @@
|
||||||
#![doc(
|
#![doc(
|
||||||
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
||||||
)]
|
)]
|
||||||
#![deny(missing_docs)]
|
#![deny(
|
||||||
#![deny(missing_debug_implementations)]
|
missing_debug_implementations,
|
||||||
#![deny(unused_results)]
|
missing_docs,
|
||||||
#![forbid(unsafe_code)]
|
unused_results,
|
||||||
#![forbid(rust_2018_idioms)]
|
clippy::extra_unused_lifetimes,
|
||||||
|
clippy::from_over_into,
|
||||||
|
clippy::needless_borrow,
|
||||||
|
clippy::new_without_default,
|
||||||
|
clippy::useless_conversion
|
||||||
|
)]
|
||||||
|
#![forbid(unsafe_code, rust_2018_idioms)]
|
||||||
|
#![allow(clippy::inherent_to_string, clippy::type_complexity)]
|
||||||
#![cfg_attr(docsrs, feature(doc_cfg))]
|
#![cfg_attr(docsrs, feature(doc_cfg))]
|
||||||
|
|
||||||
pub use futures;
|
pub use futures;
|
||||||
|
|
||||||
mod command;
|
mod command;
|
||||||
|
|
|
||||||
|
|
@ -66,8 +66,6 @@ where
|
||||||
|
|
||||||
let future = future.then(|message| async move {
|
let future = future.then(|message| async move {
|
||||||
let _ = sender.send(message).await;
|
let _ = sender.send(message).await;
|
||||||
|
|
||||||
()
|
|
||||||
});
|
});
|
||||||
|
|
||||||
self.executor.spawn(future);
|
self.executor.spawn(future);
|
||||||
|
|
|
||||||
|
|
@ -183,11 +183,7 @@ where
|
||||||
|
|
||||||
let mapper = self.mapper;
|
let mapper = self.mapper;
|
||||||
|
|
||||||
Box::pin(
|
Box::pin(self.recipe.stream(input).map(mapper))
|
||||||
self.recipe
|
|
||||||
.stream(input)
|
|
||||||
.map(move |element| mapper(element)),
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -127,7 +127,7 @@ where
|
||||||
futures.push(Box::pin(future));
|
futures.push(Box::pin(future));
|
||||||
}
|
}
|
||||||
|
|
||||||
self.subscriptions.retain(|id, _| alive.contains(&id));
|
self.subscriptions.retain(|id, _| alive.contains(id));
|
||||||
|
|
||||||
futures
|
futures
|
||||||
}
|
}
|
||||||
|
|
@ -156,3 +156,13 @@ where
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<Hasher, Event> Default for Tracker<Hasher, Event>
|
||||||
|
where
|
||||||
|
Hasher: std::hash::Hasher + Default,
|
||||||
|
Event: 'static + Send + Clone,
|
||||||
|
{
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -173,7 +173,6 @@ impl Backend {
|
||||||
glow_glyph::VerticalAlign::Bottom
|
glow_glyph::VerticalAlign::Bottom
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
..Default::default()
|
|
||||||
};
|
};
|
||||||
|
|
||||||
self.text_pipeline.queue(text);
|
self.text_pipeline.queue(text);
|
||||||
|
|
|
||||||
|
|
@ -7,10 +7,18 @@
|
||||||
#![doc(
|
#![doc(
|
||||||
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
||||||
)]
|
)]
|
||||||
#![deny(missing_docs)]
|
#![deny(
|
||||||
#![deny(missing_debug_implementations)]
|
missing_debug_implementations,
|
||||||
#![deny(unused_results)]
|
missing_docs,
|
||||||
|
unused_results,
|
||||||
|
clippy::extra_unused_lifetimes,
|
||||||
|
clippy::from_over_into,
|
||||||
|
clippy::needless_borrow,
|
||||||
|
clippy::new_without_default,
|
||||||
|
clippy::useless_conversion
|
||||||
|
)]
|
||||||
#![forbid(rust_2018_idioms)]
|
#![forbid(rust_2018_idioms)]
|
||||||
|
#![allow(clippy::inherent_to_string, clippy::type_complexity)]
|
||||||
#![cfg_attr(docsrs, feature(doc_cfg))]
|
#![cfg_attr(docsrs, feature(doc_cfg))]
|
||||||
|
|
||||||
pub use glow;
|
pub use glow;
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ impl Shader {
|
||||||
unsafe {
|
unsafe {
|
||||||
let shader = gl.create_shader(stage).expect("Cannot create shader");
|
let shader = gl.create_shader(stage).expect("Cannot create shader");
|
||||||
|
|
||||||
gl.shader_source(shader, &content);
|
gl.shader_source(shader, content);
|
||||||
gl.compile_shader(shader);
|
gl.compile_shader(shader);
|
||||||
|
|
||||||
if !gl.get_shader_compile_status(shader) {
|
if !gl.get_shader_compile_status(shader) {
|
||||||
|
|
|
||||||
|
|
@ -110,22 +110,13 @@ impl Pipeline {
|
||||||
bounds: Rectangle<u32>,
|
bounds: Rectangle<u32>,
|
||||||
) {
|
) {
|
||||||
// TODO: Remove this allocation (probably by changing the shader and removing the need of two `position`)
|
// TODO: Remove this allocation (probably by changing the shader and removing the need of two `position`)
|
||||||
let vertices: Vec<Vertex> = instances
|
let vertices: Vec<Vertex> =
|
||||||
.iter()
|
instances.iter().flat_map(Vertex::from_quad).collect();
|
||||||
.flat_map(|quad| Vertex::from_quad(quad))
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
// TODO: Remove this allocation (or allocate only when needed)
|
// TODO: Remove this allocation (or allocate only when needed)
|
||||||
let indices: Vec<i32> = (0..instances.len().min(MAX_QUADS) as i32)
|
let indices: Vec<i32> = (0..instances.len().min(MAX_QUADS) as i32)
|
||||||
.flat_map(|i| {
|
.flat_map(|i| {
|
||||||
[
|
[i * 4, 1 + i * 4, 2 + i * 4, 2 + i * 4, 1 + i * 4, 3 + i * 4]
|
||||||
0 + i * 4,
|
|
||||||
1 + i * 4,
|
|
||||||
2 + i * 4,
|
|
||||||
2 + i * 4,
|
|
||||||
1 + i * 4,
|
|
||||||
3 + i * 4,
|
|
||||||
]
|
|
||||||
})
|
})
|
||||||
.cycle()
|
.cycle()
|
||||||
.take(instances.len() * 6)
|
.take(instances.len() * 6)
|
||||||
|
|
@ -187,13 +178,13 @@ impl Pipeline {
|
||||||
gl.buffer_sub_data_u8_slice(
|
gl.buffer_sub_data_u8_slice(
|
||||||
glow::ARRAY_BUFFER,
|
glow::ARRAY_BUFFER,
|
||||||
0,
|
0,
|
||||||
bytemuck::cast_slice(&vertices),
|
bytemuck::cast_slice(vertices),
|
||||||
);
|
);
|
||||||
|
|
||||||
gl.buffer_sub_data_u8_slice(
|
gl.buffer_sub_data_u8_slice(
|
||||||
glow::ELEMENT_ARRAY_BUFFER,
|
glow::ELEMENT_ARRAY_BUFFER,
|
||||||
0,
|
0,
|
||||||
bytemuck::cast_slice(&indices),
|
bytemuck::cast_slice(indices),
|
||||||
);
|
);
|
||||||
|
|
||||||
gl.draw_elements(
|
gl.draw_elements(
|
||||||
|
|
|
||||||
|
|
@ -154,7 +154,7 @@ impl Pipeline {
|
||||||
gl.buffer_sub_data_u8_slice(
|
gl.buffer_sub_data_u8_slice(
|
||||||
glow::ARRAY_BUFFER,
|
glow::ARRAY_BUFFER,
|
||||||
0,
|
0,
|
||||||
bytemuck::cast_slice(&instances),
|
bytemuck::cast_slice(instances),
|
||||||
);
|
);
|
||||||
|
|
||||||
gl.draw_arrays_instanced(
|
gl.draw_arrays_instanced(
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@ impl Pipeline {
|
||||||
#[cfg(target_arch = "wasm32")]
|
#[cfg(target_arch = "wasm32")]
|
||||||
let draw_brush_builder = draw_brush_builder.draw_cache_align_4x4(true);
|
let draw_brush_builder = draw_brush_builder.draw_cache_align_4x4(true);
|
||||||
|
|
||||||
let draw_brush = draw_brush_builder.build(&gl);
|
let draw_brush = draw_brush_builder.build(gl);
|
||||||
|
|
||||||
let measure_brush =
|
let measure_brush =
|
||||||
glyph_brush::GlyphBrushBuilder::using_font(font).build();
|
glyph_brush::GlyphBrushBuilder::using_font(font).build();
|
||||||
|
|
@ -180,7 +180,8 @@ impl Pipeline {
|
||||||
}
|
}
|
||||||
b_count += utf8_len;
|
b_count += utf8_len;
|
||||||
}
|
}
|
||||||
return byte_index;
|
|
||||||
|
byte_index
|
||||||
};
|
};
|
||||||
|
|
||||||
if !nearest_only {
|
if !nearest_only {
|
||||||
|
|
|
||||||
|
|
@ -7,11 +7,20 @@
|
||||||
#![doc(
|
#![doc(
|
||||||
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
||||||
)]
|
)]
|
||||||
#![deny(missing_docs)]
|
#![deny(
|
||||||
#![deny(missing_debug_implementations)]
|
missing_docs,
|
||||||
#![deny(unused_results)]
|
missing_debug_implementations,
|
||||||
#![deny(unsafe_code)]
|
unsafe_code,
|
||||||
|
unused_results,
|
||||||
|
clippy::extra_unused_lifetimes,
|
||||||
|
clippy::from_over_into,
|
||||||
|
clippy::needless_borrow,
|
||||||
|
clippy::new_without_default,
|
||||||
|
clippy::useless_conversion
|
||||||
|
)]
|
||||||
#![forbid(rust_2018_idioms)]
|
#![forbid(rust_2018_idioms)]
|
||||||
|
#![allow(clippy::inherent_to_string, clippy::type_complexity)]
|
||||||
|
#![cfg_attr(docsrs, feature(doc_cfg))]
|
||||||
|
|
||||||
pub use glutin;
|
pub use glutin;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -37,3 +37,9 @@ impl Source {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Default for Source {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -202,7 +202,7 @@ impl<'a> Layer<'a> {
|
||||||
Self::process_primitive(
|
Self::process_primitive(
|
||||||
layers,
|
layers,
|
||||||
translation + *new_translation,
|
translation + *new_translation,
|
||||||
&content,
|
content,
|
||||||
current_layer,
|
current_layer,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
@ -210,7 +210,7 @@ impl<'a> Layer<'a> {
|
||||||
Self::process_primitive(
|
Self::process_primitive(
|
||||||
layers,
|
layers,
|
||||||
translation,
|
translation,
|
||||||
&cache,
|
cache,
|
||||||
current_layer,
|
current_layer,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -7,11 +7,19 @@
|
||||||
#![doc(
|
#![doc(
|
||||||
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
||||||
)]
|
)]
|
||||||
#![deny(missing_docs)]
|
#![deny(
|
||||||
#![deny(missing_debug_implementations)]
|
missing_debug_implementations,
|
||||||
#![deny(unused_results)]
|
missing_docs,
|
||||||
#![deny(unsafe_code)]
|
unsafe_code,
|
||||||
|
unused_results,
|
||||||
|
clippy::extra_unused_lifetimes,
|
||||||
|
clippy::from_over_into,
|
||||||
|
clippy::needless_borrow,
|
||||||
|
clippy::new_without_default,
|
||||||
|
clippy::useless_conversion
|
||||||
|
)]
|
||||||
#![forbid(rust_2018_idioms)]
|
#![forbid(rust_2018_idioms)]
|
||||||
|
#![allow(clippy::inherent_to_string, clippy::type_complexity)]
|
||||||
#![cfg_attr(docsrs, feature(doc_cfg))]
|
#![cfg_attr(docsrs, feature(doc_cfg))]
|
||||||
mod antialiasing;
|
mod antialiasing;
|
||||||
mod error;
|
mod error;
|
||||||
|
|
|
||||||
|
|
@ -73,9 +73,8 @@ impl Path {
|
||||||
|
|
||||||
pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path {
|
pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path {
|
||||||
Path::new(|builder| {
|
Path::new(|builder| {
|
||||||
let segments_odd = (line_dash.segments.len() % 2 == 1).then(|| {
|
let segments_odd = (line_dash.segments.len() % 2 == 1)
|
||||||
[&line_dash.segments[..], &line_dash.segments[..]].concat()
|
.then(|| [line_dash.segments, line_dash.segments].concat());
|
||||||
});
|
|
||||||
|
|
||||||
let mut draw_line = false;
|
let mut draw_line = false;
|
||||||
|
|
||||||
|
|
@ -103,8 +102,7 @@ pub(super) fn dashed(path: &Path, line_dash: LineDash<'_>) -> Path {
|
||||||
},
|
},
|
||||||
index: line_dash.offset,
|
index: line_dash.offset,
|
||||||
intervals: segments_odd
|
intervals: segments_odd
|
||||||
.as_ref()
|
.as_deref()
|
||||||
.map(Vec::as_slice)
|
|
||||||
.unwrap_or(line_dash.segments),
|
.unwrap_or(line_dash.segments),
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -53,7 +53,7 @@ impl Builder {
|
||||||
let _ = self.raw.line_to(a);
|
let _ = self.raw.line_to(a);
|
||||||
}
|
}
|
||||||
|
|
||||||
let _ = self.raw.arc_to(
|
self.raw.arc_to(
|
||||||
math::Vector::new(radius, radius),
|
math::Vector::new(radius, radius),
|
||||||
math::Angle::radians(0.0),
|
math::Angle::radians(0.0),
|
||||||
path::ArcFlags::default(),
|
path::ArcFlags::default(),
|
||||||
|
|
@ -151,3 +151,9 @@ impl Builder {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Default for Builder {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -53,12 +53,12 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, B, T> Into<Element<'a, Message, Renderer<B, T>>>
|
impl<'a, Message, B, T> From<QRCode<'a>>
|
||||||
for QRCode<'a>
|
for Element<'a, Message, Renderer<B, T>>
|
||||||
where
|
where
|
||||||
B: Backend,
|
B: Backend,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer<B, T>> {
|
fn from(qr_code: QRCode<'a>) -> Self {
|
||||||
Element::new(self)
|
Self::new(qr_code)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -67,10 +67,7 @@ where
|
||||||
let side_length = (self.state.width + 2 * QUIET_ZONE) as f32
|
let side_length = (self.state.width + 2 * QUIET_ZONE) as f32
|
||||||
* f32::from(self.cell_size);
|
* f32::from(self.cell_size);
|
||||||
|
|
||||||
layout::Node::new(Size::new(
|
layout::Node::new(Size::new(side_length, side_length))
|
||||||
f32::from(side_length),
|
|
||||||
f32::from(side_length),
|
|
||||||
))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn draw(
|
fn draw(
|
||||||
|
|
@ -128,13 +125,13 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, B, T> Into<Element<'a, Message, Renderer<B, T>>>
|
impl<'a, Message, B, T> From<QRCode<'a>>
|
||||||
for QRCode<'a>
|
for Element<'a, Message, Renderer<B, T>>
|
||||||
where
|
where
|
||||||
B: Backend,
|
B: Backend,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer<B, T>> {
|
fn from(qr_code: QRCode<'a>) -> Self {
|
||||||
Element::new(self)
|
Self::new(qr_code)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,6 +35,9 @@ pub trait GLCompositor: Sized {
|
||||||
/// Creates a new [`GLCompositor`] and [`Renderer`] with the given
|
/// Creates a new [`GLCompositor`] and [`Renderer`] with the given
|
||||||
/// [`Settings`] and an OpenGL address loader function.
|
/// [`Settings`] and an OpenGL address loader function.
|
||||||
///
|
///
|
||||||
|
/// # Safety
|
||||||
|
/// The `loader_function` should resolve to valid OpenGL bindings.
|
||||||
|
///
|
||||||
/// [`Renderer`]: crate::Renderer
|
/// [`Renderer`]: crate::Renderer
|
||||||
/// [`Backend`]: crate::Backend
|
/// [`Backend`]: crate::Backend
|
||||||
/// [`Settings`]: Self::Settings
|
/// [`Settings`]: Self::Settings
|
||||||
|
|
|
||||||
|
|
@ -38,7 +38,7 @@ pub trait Component<Message, Renderer> {
|
||||||
|
|
||||||
/// Produces the widgets of the [`Component`], which may trigger an [`Event`](Component::Event)
|
/// Produces the widgets of the [`Component`], which may trigger an [`Event`](Component::Event)
|
||||||
/// on user interaction.
|
/// on user interaction.
|
||||||
fn view(&mut self) -> Element<Self::Event, Renderer>;
|
fn view(&mut self) -> Element<'_, Self::Event, Renderer>;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Turns an implementor of [`Component`] into an [`Element`] that can be
|
/// Turns an implementor of [`Component`] into an [`Element`] that can be
|
||||||
|
|
@ -350,7 +350,7 @@ where
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
cursor_position: Point,
|
cursor_position: Point,
|
||||||
) {
|
) {
|
||||||
self.with_overlay_maybe(|overlay| {
|
let _ = self.with_overlay_maybe(|overlay| {
|
||||||
overlay.draw(renderer, theme, style, layout, cursor_position);
|
overlay.draw(renderer, theme, style, layout, cursor_position);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -396,7 +396,7 @@ where
|
||||||
&mut local_shell,
|
&mut local_shell,
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
.unwrap_or_else(|| iced_native::event::Status::Ignored);
|
.unwrap_or(iced_native::event::Status::Ignored);
|
||||||
|
|
||||||
local_shell.revalidate_layout(|| shell.invalidate_layout());
|
local_shell.revalidate_layout(|| shell.invalidate_layout());
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,21 @@
|
||||||
#![doc(
|
#![doc(
|
||||||
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
||||||
)]
|
)]
|
||||||
|
#![deny(
|
||||||
|
missing_debug_implementations,
|
||||||
|
unused_results,
|
||||||
|
clippy::extra_unused_lifetimes,
|
||||||
|
clippy::from_over_into,
|
||||||
|
clippy::needless_borrow,
|
||||||
|
clippy::new_without_default,
|
||||||
|
clippy::useless_conversion
|
||||||
|
)]
|
||||||
|
#![forbid(unsafe_code)]
|
||||||
|
#![allow(
|
||||||
|
clippy::await_holding_refcell_ref,
|
||||||
|
clippy::inherent_to_string,
|
||||||
|
clippy::type_complexity
|
||||||
|
)]
|
||||||
#![cfg_attr(docsrs, feature(doc_cfg))]
|
#![cfg_attr(docsrs, feature(doc_cfg))]
|
||||||
pub mod component;
|
pub mod component;
|
||||||
pub mod responsive;
|
pub mod responsive;
|
||||||
|
|
|
||||||
|
|
@ -43,7 +43,7 @@ pub trait Component<Message, Renderer> {
|
||||||
|
|
||||||
/// Produces the widgets of the [`Component`], which may trigger an [`Event`](Component::Event)
|
/// Produces the widgets of the [`Component`], which may trigger an [`Event`](Component::Event)
|
||||||
/// on user interaction.
|
/// on user interaction.
|
||||||
fn view(&self, state: &Self::State) -> Element<Self::Event, Renderer>;
|
fn view(&self, state: &Self::State) -> Element<'_, Self::Event, Renderer>;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Turns an implementor of [`Component`] into an [`Element`] that can be
|
/// Turns an implementor of [`Component`] into an [`Element`] that can be
|
||||||
|
|
@ -382,7 +382,7 @@ where
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
cursor_position: Point,
|
cursor_position: Point,
|
||||||
) {
|
) {
|
||||||
self.with_overlay_maybe(|overlay| {
|
let _ = self.with_overlay_maybe(|overlay| {
|
||||||
overlay.draw(renderer, theme, style, layout, cursor_position);
|
overlay.draw(renderer, theme, style, layout, cursor_position);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -428,7 +428,7 @@ where
|
||||||
&mut local_shell,
|
&mut local_shell,
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
.unwrap_or_else(|| iced_native::event::Status::Ignored);
|
.unwrap_or(iced_native::event::Status::Ignored);
|
||||||
|
|
||||||
local_shell.revalidate_layout(|| shell.invalidate_layout());
|
local_shell.revalidate_layout(|| shell.invalidate_layout());
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -341,7 +341,7 @@ where
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
cursor_position: Point,
|
cursor_position: Point,
|
||||||
) {
|
) {
|
||||||
self.with_overlay_maybe(|overlay| {
|
let _ = self.with_overlay_maybe(|overlay| {
|
||||||
overlay.draw(renderer, theme, style, layout, cursor_position);
|
overlay.draw(renderer, theme, style, layout, cursor_position);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -383,6 +383,6 @@ where
|
||||||
shell,
|
shell,
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
.unwrap_or_else(|| iced_native::event::Status::Ignored)
|
.unwrap_or(iced_native::event::Status::Ignored)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -224,7 +224,7 @@ where
|
||||||
where
|
where
|
||||||
R: Deref<Target = Renderer>,
|
R: Deref<Target = Renderer>,
|
||||||
{
|
{
|
||||||
self.content.resolve(&mut self.state, renderer, f)
|
self.content.resolve(self.state, renderer, f)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -363,7 +363,7 @@ where
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
cursor_position: Point,
|
cursor_position: Point,
|
||||||
) {
|
) {
|
||||||
self.with_overlay_maybe(|overlay| {
|
let _ = self.with_overlay_maybe(|overlay| {
|
||||||
overlay.draw(renderer, theme, style, layout, cursor_position);
|
overlay.draw(renderer, theme, style, layout, cursor_position);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -405,6 +405,6 @@ where
|
||||||
shell,
|
shell,
|
||||||
)
|
)
|
||||||
})
|
})
|
||||||
.unwrap_or_else(|| iced_native::event::Status::Ignored)
|
.unwrap_or(iced_native::event::Status::Ignored)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -186,6 +186,12 @@ impl Debug {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl Default for Debug {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
struct TimeBuffer {
|
struct TimeBuffer {
|
||||||
head: usize,
|
head: usize,
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
#![allow(missing_docs)]
|
#![allow(missing_docs)]
|
||||||
#[derive(Debug)]
|
#[derive(Debug, Default)]
|
||||||
pub struct Debug;
|
pub struct Debug;
|
||||||
|
|
||||||
impl Debug {
|
impl Debug {
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,7 @@
|
||||||
/// The hasher used to compare layouts.
|
/// The hasher used to compare layouts.
|
||||||
#[derive(Debug)]
|
#[derive(Debug, Default)]
|
||||||
pub struct Hasher(twox_hash::XxHash64);
|
pub struct Hasher(twox_hash::XxHash64);
|
||||||
|
|
||||||
impl Default for Hasher {
|
|
||||||
fn default() -> Self {
|
|
||||||
Hasher(twox_hash::XxHash64::default())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl core::hash::Hasher for Hasher {
|
impl core::hash::Hasher for Hasher {
|
||||||
fn write(&mut self, bytes: &[u8]) {
|
fn write(&mut self, bytes: &[u8]) {
|
||||||
self.0.write(bytes)
|
self.0.write(bytes)
|
||||||
|
|
|
||||||
|
|
@ -31,11 +31,19 @@
|
||||||
#![doc(
|
#![doc(
|
||||||
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
||||||
)]
|
)]
|
||||||
#![deny(missing_docs)]
|
#![deny(
|
||||||
#![deny(missing_debug_implementations)]
|
missing_debug_implementations,
|
||||||
#![deny(unused_results)]
|
missing_docs,
|
||||||
#![forbid(unsafe_code)]
|
unused_results,
|
||||||
#![forbid(rust_2018_idioms)]
|
clippy::extra_unused_lifetimes,
|
||||||
|
clippy::from_over_into,
|
||||||
|
clippy::needless_borrow,
|
||||||
|
clippy::new_without_default,
|
||||||
|
clippy::useless_conversion
|
||||||
|
)]
|
||||||
|
#![forbid(unsafe_code, rust_2018_idioms)]
|
||||||
|
#![allow(clippy::inherent_to_string, clippy::type_complexity)]
|
||||||
|
#![cfg_attr(docsrs, feature(doc_cfg))]
|
||||||
pub mod clipboard;
|
pub mod clipboard;
|
||||||
pub mod command;
|
pub mod command;
|
||||||
pub mod event;
|
pub mod event;
|
||||||
|
|
|
||||||
|
|
@ -174,9 +174,9 @@ where
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
container,
|
container,
|
||||||
width: width,
|
width,
|
||||||
target_height,
|
target_height,
|
||||||
style: style,
|
style,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -230,7 +230,7 @@ where
|
||||||
shell: &mut Shell<'_, Message>,
|
shell: &mut Shell<'_, Message>,
|
||||||
) -> event::Status {
|
) -> event::Status {
|
||||||
self.container.on_event(
|
self.container.on_event(
|
||||||
event.clone(),
|
event,
|
||||||
layout,
|
layout,
|
||||||
cursor_position,
|
cursor_position,
|
||||||
renderer,
|
renderer,
|
||||||
|
|
@ -326,7 +326,8 @@ where
|
||||||
use std::f32;
|
use std::f32;
|
||||||
|
|
||||||
let limits = limits.width(Length::Fill).height(Length::Shrink);
|
let limits = limits.width(Length::Fill).height(Length::Shrink);
|
||||||
let text_size = self.text_size.unwrap_or(renderer.default_size());
|
let text_size =
|
||||||
|
self.text_size.unwrap_or_else(|| renderer.default_size());
|
||||||
|
|
||||||
let size = {
|
let size = {
|
||||||
let intrinsic = Size::new(
|
let intrinsic = Size::new(
|
||||||
|
|
@ -366,8 +367,9 @@ where
|
||||||
let bounds = layout.bounds();
|
let bounds = layout.bounds();
|
||||||
|
|
||||||
if bounds.contains(cursor_position) {
|
if bounds.contains(cursor_position) {
|
||||||
let text_size =
|
let text_size = self
|
||||||
self.text_size.unwrap_or(renderer.default_size());
|
.text_size
|
||||||
|
.unwrap_or_else(|| renderer.default_size());
|
||||||
|
|
||||||
*self.hovered_option = Some(
|
*self.hovered_option = Some(
|
||||||
((cursor_position.y - bounds.y)
|
((cursor_position.y - bounds.y)
|
||||||
|
|
@ -380,8 +382,9 @@ where
|
||||||
let bounds = layout.bounds();
|
let bounds = layout.bounds();
|
||||||
|
|
||||||
if bounds.contains(cursor_position) {
|
if bounds.contains(cursor_position) {
|
||||||
let text_size =
|
let text_size = self
|
||||||
self.text_size.unwrap_or(renderer.default_size());
|
.text_size
|
||||||
|
.unwrap_or_else(|| renderer.default_size());
|
||||||
|
|
||||||
*self.hovered_option = Some(
|
*self.hovered_option = Some(
|
||||||
((cursor_position.y - bounds.y)
|
((cursor_position.y - bounds.y)
|
||||||
|
|
@ -430,7 +433,8 @@ where
|
||||||
let appearance = theme.appearance(self.style);
|
let appearance = theme.appearance(self.style);
|
||||||
let bounds = layout.bounds();
|
let bounds = layout.bounds();
|
||||||
|
|
||||||
let text_size = self.text_size.unwrap_or(renderer.default_size());
|
let text_size =
|
||||||
|
self.text_size.unwrap_or_else(|| renderer.default_size());
|
||||||
let option_height = (text_size + self.padding.vertical()) as usize;
|
let option_height = (text_size + self.padding.vertical()) as usize;
|
||||||
|
|
||||||
let offset = viewport.y - bounds.y;
|
let offset = viewport.y - bounds.y;
|
||||||
|
|
@ -485,15 +489,15 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, T, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, T, Message, Renderer> From<List<'a, T, Renderer>>
|
||||||
for List<'a, T, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
T: ToString + Clone,
|
T: ToString + Clone,
|
||||||
Message: 'a,
|
Message: 'a,
|
||||||
Renderer: 'a + text::Renderer,
|
Renderer: 'a + text::Renderer,
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(list: List<'a, T, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Element::new(list)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -113,7 +113,7 @@ where
|
||||||
&mut messages,
|
&mut messages,
|
||||||
);
|
);
|
||||||
|
|
||||||
messages.extend(self.queued_messages.drain(..));
|
messages.append(&mut self.queued_messages);
|
||||||
self.queued_events.clear();
|
self.queued_events.clear();
|
||||||
debug.event_processing_finished();
|
debug.event_processing_finished();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ use crate::{Background, Font, Point, Rectangle, Size, Theme, Vector};
|
||||||
/// A renderer that does nothing.
|
/// A renderer that does nothing.
|
||||||
///
|
///
|
||||||
/// It can be useful if you are writing tests!
|
/// It can be useful if you are writing tests!
|
||||||
#[derive(Debug, Clone, Copy)]
|
#[derive(Debug, Clone, Copy, Default)]
|
||||||
pub struct Null;
|
pub struct Null;
|
||||||
|
|
||||||
impl Null {
|
impl Null {
|
||||||
|
|
|
||||||
|
|
@ -430,7 +430,7 @@ where
|
||||||
overlay
|
overlay
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.and_then(|layout| {
|
.and_then(|layout| {
|
||||||
root.overlay(Layout::new(&base), renderer).map(|overlay| {
|
root.overlay(Layout::new(base), renderer).map(|overlay| {
|
||||||
let overlay_interaction = overlay.mouse_interaction(
|
let overlay_interaction = overlay.mouse_interaction(
|
||||||
Layout::new(layout),
|
Layout::new(layout),
|
||||||
cursor_position,
|
cursor_position,
|
||||||
|
|
|
||||||
|
|
@ -382,7 +382,7 @@ where
|
||||||
self.on_press.is_some(),
|
self.on_press.is_some(),
|
||||||
theme,
|
theme,
|
||||||
self.style,
|
self.style,
|
||||||
|| &self.state,
|
|| self.state,
|
||||||
);
|
);
|
||||||
|
|
||||||
self.content.draw(
|
self.content.draw(
|
||||||
|
|
|
||||||
|
|
@ -158,7 +158,10 @@ where
|
||||||
Text::new(&self.label)
|
Text::new(&self.label)
|
||||||
.font(self.font.clone())
|
.font(self.font.clone())
|
||||||
.width(self.width)
|
.width(self.width)
|
||||||
.size(self.text_size.unwrap_or(renderer.default_size())),
|
.size(
|
||||||
|
self.text_size
|
||||||
|
.unwrap_or_else(|| renderer.default_size()),
|
||||||
|
),
|
||||||
)
|
)
|
||||||
.layout(renderer, limits)
|
.layout(renderer, limits)
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -102,6 +102,12 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<'a, Message, Renderer> Default for Column<'a, Message, Renderer> {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Widget<Message, Renderer>
|
impl<'a, Message, Renderer> Widget<Message, Renderer>
|
||||||
for Column<'a, Message, Renderer>
|
for Column<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
|
|
|
||||||
|
|
@ -835,8 +835,7 @@ fn hovered_split<'a>(
|
||||||
) -> Option<(Split, Axis, Rectangle)> {
|
) -> Option<(Split, Axis, Rectangle)> {
|
||||||
splits
|
splits
|
||||||
.filter_map(|(split, (axis, region, ratio))| {
|
.filter_map(|(split, (axis, region, ratio))| {
|
||||||
let bounds =
|
let bounds = axis.split_line_bounds(*region, *ratio, spacing);
|
||||||
axis.split_line_bounds(*region, *ratio, f32::from(spacing));
|
|
||||||
|
|
||||||
if bounds.contains(cursor_position) {
|
if bounds.contains(cursor_position) {
|
||||||
Some((*split, *axis, bounds))
|
Some((*split, *axis, bounds))
|
||||||
|
|
|
||||||
|
|
@ -36,14 +36,11 @@ impl Node {
|
||||||
|
|
||||||
std::iter::from_fn(move || {
|
std::iter::from_fn(move || {
|
||||||
while let Some(node) = unvisited_nodes.pop() {
|
while let Some(node) = unvisited_nodes.pop() {
|
||||||
match node {
|
if let Node::Split { id, a, b, .. } = node {
|
||||||
Node::Split { id, a, b, .. } => {
|
unvisited_nodes.push(a);
|
||||||
unvisited_nodes.push(a);
|
unvisited_nodes.push(b);
|
||||||
unvisited_nodes.push(b);
|
|
||||||
|
|
||||||
return Some(id);
|
return Some(id);
|
||||||
}
|
|
||||||
_ => {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -124,12 +121,9 @@ impl Node {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub(crate) fn update(&mut self, f: &impl Fn(&mut Node)) {
|
pub(crate) fn update(&mut self, f: &impl Fn(&mut Node)) {
|
||||||
match self {
|
if let Node::Split { a, b, .. } = self {
|
||||||
Node::Split { a, b, .. } => {
|
a.update(f);
|
||||||
a.update(f);
|
b.update(f);
|
||||||
b.update(f);
|
|
||||||
}
|
|
||||||
_ => {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
f(self);
|
f(self);
|
||||||
|
|
|
||||||
|
|
@ -66,6 +66,11 @@ impl<T> State<T> {
|
||||||
self.panes.len()
|
self.panes.len()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Returns `true` if the amount of panes in the [`State`] is 0.
|
||||||
|
pub fn is_empty(&self) -> bool {
|
||||||
|
self.len() == 0
|
||||||
|
}
|
||||||
|
|
||||||
/// Returns the internal state of the given [`Pane`], if it exists.
|
/// Returns the internal state of the given [`Pane`], if it exists.
|
||||||
pub fn get(&self, pane: &Pane) -> Option<&T> {
|
pub fn get(&self, pane: &Pane) -> Option<&T> {
|
||||||
self.panes.get(pane)
|
self.panes.get(pane)
|
||||||
|
|
|
||||||
|
|
@ -160,7 +160,7 @@ where
|
||||||
|
|
||||||
let limits = limits.width(width).height(Length::Shrink).pad(padding);
|
let limits = limits.width(width).height(Length::Shrink).pad(padding);
|
||||||
|
|
||||||
let text_size = text_size.unwrap_or(renderer.default_size());
|
let text_size = text_size.unwrap_or_else(|| renderer.default_size());
|
||||||
|
|
||||||
let max_width = match width {
|
let max_width = match width {
|
||||||
Length::Shrink => {
|
Length::Shrink => {
|
||||||
|
|
@ -407,10 +407,9 @@ pub fn draw<T, Renderer>(
|
||||||
|
|
||||||
let label = selected.map(ToString::to_string);
|
let label = selected.map(ToString::to_string);
|
||||||
|
|
||||||
if let Some(label) =
|
if let Some(label) = label.as_deref().or(placeholder) {
|
||||||
label.as_ref().map(String::as_str).or_else(|| placeholder)
|
let text_size =
|
||||||
{
|
f32::from(text_size.unwrap_or_else(|| renderer.default_size()));
|
||||||
let text_size = f32::from(text_size.unwrap_or(renderer.default_size()));
|
|
||||||
|
|
||||||
renderer.fill_text(Text {
|
renderer.fill_text(Text {
|
||||||
content: label,
|
content: label,
|
||||||
|
|
@ -460,7 +459,7 @@ where
|
||||||
self.padding,
|
self.padding,
|
||||||
self.text_size,
|
self.text_size,
|
||||||
&self.font,
|
&self.font,
|
||||||
self.placeholder.as_ref().map(String::as_str),
|
self.placeholder.as_deref(),
|
||||||
&self.options,
|
&self.options,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
@ -513,7 +512,7 @@ where
|
||||||
self.padding,
|
self.padding,
|
||||||
self.text_size,
|
self.text_size,
|
||||||
&self.font,
|
&self.font,
|
||||||
self.placeholder.as_ref().map(String::as_str),
|
self.placeholder.as_deref(),
|
||||||
self.selected.as_ref(),
|
self.selected.as_ref(),
|
||||||
self.style,
|
self.style,
|
||||||
)
|
)
|
||||||
|
|
@ -526,7 +525,7 @@ where
|
||||||
) -> Option<overlay::Element<'_, Message, Renderer>> {
|
) -> Option<overlay::Element<'_, Message, Renderer>> {
|
||||||
overlay(
|
overlay(
|
||||||
layout,
|
layout,
|
||||||
&mut self.state,
|
self.state,
|
||||||
self.padding,
|
self.padding,
|
||||||
self.text_size,
|
self.text_size,
|
||||||
self.font.clone(),
|
self.font.clone(),
|
||||||
|
|
@ -536,8 +535,8 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, T: 'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, T: 'a, Message, Renderer> From<PickList<'a, T, Message, Renderer>>
|
||||||
for PickList<'a, T, Message, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
T: Clone + ToString + Eq,
|
T: Clone + ToString + Eq,
|
||||||
[T]: ToOwned<Owned = Vec<T>>,
|
[T]: ToOwned<Owned = Vec<T>>,
|
||||||
|
|
@ -550,7 +549,7 @@ where
|
||||||
<Renderer::Theme as StyleSheet>::Style:
|
<Renderer::Theme as StyleSheet>::Style:
|
||||||
Into<<Renderer::Theme as menu::StyleSheet>::Style>,
|
Into<<Renderer::Theme as menu::StyleSheet>::Style>,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(pick_list: PickList<'a, T, Message, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Element::new(pick_list)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -76,7 +76,7 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Widget<Message, Renderer> for ProgressBar<Renderer>
|
impl<Message, Renderer> Widget<Message, Renderer> for ProgressBar<Renderer>
|
||||||
where
|
where
|
||||||
Renderer: crate::Renderer,
|
Renderer: crate::Renderer,
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
|
|
|
||||||
|
|
@ -168,11 +168,9 @@ where
|
||||||
.width(Length::Units(self.size))
|
.width(Length::Units(self.size))
|
||||||
.height(Length::Units(self.size)),
|
.height(Length::Units(self.size)),
|
||||||
)
|
)
|
||||||
.push(
|
.push(Text::new(&self.label).width(self.width).size(
|
||||||
Text::new(&self.label)
|
self.text_size.unwrap_or_else(|| renderer.default_size()),
|
||||||
.width(self.width)
|
))
|
||||||
.size(self.text_size.unwrap_or(renderer.default_size())),
|
|
||||||
)
|
|
||||||
.layout(renderer, limits)
|
.layout(renderer, limits)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -102,6 +102,12 @@ impl<'a, Message, Renderer> Row<'a, Message, Renderer> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<'a, Message, Renderer> Default for Row<'a, Message, Renderer> {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Widget<Message, Renderer>
|
impl<'a, Message, Renderer> Widget<Message, Renderer>
|
||||||
for Row<'a, Message, Renderer>
|
for Row<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ where
|
||||||
/// Creates a vertical [`Rule`] with the given width.
|
/// Creates a vertical [`Rule`] with the given width.
|
||||||
pub fn vertical(width: u16) -> Self {
|
pub fn vertical(width: u16) -> Self {
|
||||||
Rule {
|
Rule {
|
||||||
width: Length::from(Length::Units(width)),
|
width: Length::Units(width),
|
||||||
height: Length::Fill,
|
height: Length::Fill,
|
||||||
is_horizontal: false,
|
is_horizontal: false,
|
||||||
style: Default::default(),
|
style: Default::default(),
|
||||||
|
|
|
||||||
|
|
@ -662,7 +662,7 @@ where
|
||||||
shell: &mut Shell<'_, Message>,
|
shell: &mut Shell<'_, Message>,
|
||||||
) -> event::Status {
|
) -> event::Status {
|
||||||
update(
|
update(
|
||||||
&mut self.state,
|
self.state,
|
||||||
event,
|
event,
|
||||||
layout,
|
layout,
|
||||||
cursor_position,
|
cursor_position,
|
||||||
|
|
@ -693,7 +693,7 @@ where
|
||||||
renderer: &Renderer,
|
renderer: &Renderer,
|
||||||
) -> mouse::Interaction {
|
) -> mouse::Interaction {
|
||||||
mouse_interaction(
|
mouse_interaction(
|
||||||
&self.state,
|
self.state,
|
||||||
layout,
|
layout,
|
||||||
cursor_position,
|
cursor_position,
|
||||||
self.scrollbar_width,
|
self.scrollbar_width,
|
||||||
|
|
@ -720,7 +720,7 @@ where
|
||||||
_viewport: &Rectangle,
|
_viewport: &Rectangle,
|
||||||
) {
|
) {
|
||||||
draw(
|
draw(
|
||||||
&self.state,
|
self.state,
|
||||||
renderer,
|
renderer,
|
||||||
theme,
|
theme,
|
||||||
layout,
|
layout,
|
||||||
|
|
|
||||||
|
|
@ -303,7 +303,7 @@ pub fn draw<T, R>(
|
||||||
HandleShape::Rectangle {
|
HandleShape::Rectangle {
|
||||||
width,
|
width,
|
||||||
border_radius,
|
border_radius,
|
||||||
} => (f32::from(width), f32::from(bounds.height), border_radius),
|
} => (f32::from(width), bounds.height, border_radius),
|
||||||
};
|
};
|
||||||
|
|
||||||
let value = value.into() as f32;
|
let value = value.into() as f32;
|
||||||
|
|
@ -410,7 +410,7 @@ where
|
||||||
layout,
|
layout,
|
||||||
cursor_position,
|
cursor_position,
|
||||||
shell,
|
shell,
|
||||||
&mut self.state,
|
self.state,
|
||||||
&mut self.value,
|
&mut self.value,
|
||||||
&self.range,
|
&self.range,
|
||||||
self.step,
|
self.step,
|
||||||
|
|
@ -432,7 +432,7 @@ where
|
||||||
renderer,
|
renderer,
|
||||||
layout,
|
layout,
|
||||||
cursor_position,
|
cursor_position,
|
||||||
&self.state,
|
self.state,
|
||||||
self.value,
|
self.value,
|
||||||
&self.range,
|
&self.range,
|
||||||
theme,
|
theme,
|
||||||
|
|
@ -447,7 +447,7 @@ where
|
||||||
_viewport: &Rectangle,
|
_viewport: &Rectangle,
|
||||||
_renderer: &Renderer,
|
_renderer: &Renderer,
|
||||||
) -> mouse::Interaction {
|
) -> mouse::Interaction {
|
||||||
mouse_interaction(layout, cursor_position, &self.state)
|
mouse_interaction(layout, cursor_position, self.state)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -131,7 +131,7 @@ where
|
||||||
) -> layout::Node {
|
) -> layout::Node {
|
||||||
let limits = limits.width(self.width).height(self.height);
|
let limits = limits.width(self.width).height(self.height);
|
||||||
|
|
||||||
let size = self.size.unwrap_or(renderer.default_size());
|
let size = self.size.unwrap_or_else(|| renderer.default_size());
|
||||||
|
|
||||||
let bounds = limits.max();
|
let bounds = limits.max();
|
||||||
|
|
||||||
|
|
@ -205,7 +205,7 @@ pub fn draw<Renderer>(
|
||||||
|
|
||||||
renderer.fill_text(crate::text::Text {
|
renderer.fill_text(crate::text::Text {
|
||||||
content,
|
content,
|
||||||
size: f32::from(size.unwrap_or(renderer.default_size())),
|
size: f32::from(size.unwrap_or_else(|| renderer.default_size())),
|
||||||
bounds: Rectangle { x, y, ..bounds },
|
bounds: Rectangle { x, y, ..bounds },
|
||||||
color: appearance.color.unwrap_or(style.text_color),
|
color: appearance.color.unwrap_or(style.text_color),
|
||||||
font,
|
font,
|
||||||
|
|
|
||||||
|
|
@ -176,7 +176,7 @@ where
|
||||||
theme,
|
theme,
|
||||||
layout,
|
layout,
|
||||||
cursor_position,
|
cursor_position,
|
||||||
&self.state,
|
self.state,
|
||||||
value.unwrap_or(&self.value),
|
value.unwrap_or(&self.value),
|
||||||
&self.placeholder,
|
&self.placeholder,
|
||||||
self.size,
|
self.size,
|
||||||
|
|
@ -198,7 +198,7 @@ pub fn layout<Renderer>(
|
||||||
where
|
where
|
||||||
Renderer: text::Renderer,
|
Renderer: text::Renderer,
|
||||||
{
|
{
|
||||||
let text_size = size.unwrap_or(renderer.default_size());
|
let text_size = size.unwrap_or_else(|| renderer.default_size());
|
||||||
|
|
||||||
let limits = limits
|
let limits = limits
|
||||||
.pad(padding)
|
.pad(padding)
|
||||||
|
|
@ -498,7 +498,7 @@ where
|
||||||
None => {
|
None => {
|
||||||
let content: String = clipboard
|
let content: String = clipboard
|
||||||
.read()
|
.read()
|
||||||
.unwrap_or(String::new())
|
.unwrap_or_default()
|
||||||
.chars()
|
.chars()
|
||||||
.filter(|c| !c.is_control())
|
.filter(|c| !c.is_control())
|
||||||
.collect();
|
.collect();
|
||||||
|
|
@ -597,7 +597,7 @@ pub fn draw<Renderer>(
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
{
|
{
|
||||||
let secure_value = is_secure.then(|| value.secure());
|
let secure_value = is_secure.then(|| value.secure());
|
||||||
let value = secure_value.as_ref().unwrap_or(&value);
|
let value = secure_value.as_ref().unwrap_or(value);
|
||||||
|
|
||||||
let bounds = layout.bounds();
|
let bounds = layout.bounds();
|
||||||
let text_bounds = layout.children().next().unwrap().bounds();
|
let text_bounds = layout.children().next().unwrap().bounds();
|
||||||
|
|
@ -623,16 +623,16 @@ pub fn draw<Renderer>(
|
||||||
);
|
);
|
||||||
|
|
||||||
let text = value.to_string();
|
let text = value.to_string();
|
||||||
let size = size.unwrap_or(renderer.default_size());
|
let size = size.unwrap_or_else(|| renderer.default_size());
|
||||||
|
|
||||||
let (cursor, offset) = if state.is_focused() {
|
let (cursor, offset) = if state.is_focused() {
|
||||||
match state.cursor.state(&value) {
|
match state.cursor.state(value) {
|
||||||
cursor::State::Index(position) => {
|
cursor::State::Index(position) => {
|
||||||
let (text_value_width, offset) =
|
let (text_value_width, offset) =
|
||||||
measure_cursor_and_scroll_offset(
|
measure_cursor_and_scroll_offset(
|
||||||
renderer,
|
renderer,
|
||||||
text_bounds,
|
text_bounds,
|
||||||
&value,
|
value,
|
||||||
size,
|
size,
|
||||||
position,
|
position,
|
||||||
font.clone(),
|
font.clone(),
|
||||||
|
|
@ -664,7 +664,7 @@ pub fn draw<Renderer>(
|
||||||
measure_cursor_and_scroll_offset(
|
measure_cursor_and_scroll_offset(
|
||||||
renderer,
|
renderer,
|
||||||
text_bounds,
|
text_bounds,
|
||||||
&value,
|
value,
|
||||||
size,
|
size,
|
||||||
left,
|
left,
|
||||||
font.clone(),
|
font.clone(),
|
||||||
|
|
@ -674,7 +674,7 @@ pub fn draw<Renderer>(
|
||||||
measure_cursor_and_scroll_offset(
|
measure_cursor_and_scroll_offset(
|
||||||
renderer,
|
renderer,
|
||||||
text_bounds,
|
text_bounds,
|
||||||
&value,
|
value,
|
||||||
size,
|
size,
|
||||||
right,
|
right,
|
||||||
font.clone(),
|
font.clone(),
|
||||||
|
|
@ -998,16 +998,16 @@ fn find_cursor_position<Renderer>(
|
||||||
where
|
where
|
||||||
Renderer: text::Renderer,
|
Renderer: text::Renderer,
|
||||||
{
|
{
|
||||||
let size = size.unwrap_or(renderer.default_size());
|
let size = size.unwrap_or_else(|| renderer.default_size());
|
||||||
|
|
||||||
let offset =
|
let offset =
|
||||||
offset(renderer, text_bounds, font.clone(), size, &value, &state);
|
offset(renderer, text_bounds, font.clone(), size, value, state);
|
||||||
|
|
||||||
renderer
|
renderer
|
||||||
.hit_test(
|
.hit_test(
|
||||||
&value.to_string(),
|
&value.to_string(),
|
||||||
size.into(),
|
size.into(),
|
||||||
font.clone(),
|
font,
|
||||||
Size::INFINITY,
|
Size::INFINITY,
|
||||||
Point::new(x + offset, text_bounds.height / 2.0),
|
Point::new(x + offset, text_bounds.height / 2.0),
|
||||||
true,
|
true,
|
||||||
|
|
|
||||||
|
|
@ -15,12 +15,9 @@ impl<'a> Editor<'a> {
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn insert(&mut self, character: char) {
|
pub fn insert(&mut self, character: char) {
|
||||||
match self.cursor.selection(self.value) {
|
if let Some((left, right)) = self.cursor.selection(self.value) {
|
||||||
Some((left, right)) => {
|
self.cursor.move_left(self.value);
|
||||||
self.cursor.move_left(self.value);
|
self.value.remove_many(left, right);
|
||||||
self.value.remove_many(left, right);
|
|
||||||
}
|
|
||||||
_ => {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
self.value.insert(self.cursor.end(self.value), character);
|
self.value.insert(self.cursor.end(self.value), character);
|
||||||
|
|
@ -29,13 +26,9 @@ impl<'a> Editor<'a> {
|
||||||
|
|
||||||
pub fn paste(&mut self, content: Value) {
|
pub fn paste(&mut self, content: Value) {
|
||||||
let length = content.len();
|
let length = content.len();
|
||||||
|
if let Some((left, right)) = self.cursor.selection(self.value) {
|
||||||
match self.cursor.selection(self.value) {
|
self.cursor.move_left(self.value);
|
||||||
Some((left, right)) => {
|
self.value.remove_many(left, right);
|
||||||
self.cursor.move_left(self.value);
|
|
||||||
self.value.remove_many(left, right);
|
|
||||||
}
|
|
||||||
_ => {}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
self.value.insert_many(self.cursor.end(self.value), content);
|
self.value.insert_many(self.cursor.end(self.value), content);
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ impl Value {
|
||||||
let previous_string =
|
let previous_string =
|
||||||
&self.graphemes[..index.min(self.graphemes.len())].concat();
|
&self.graphemes[..index.min(self.graphemes.len())].concat();
|
||||||
|
|
||||||
UnicodeSegmentation::split_word_bound_indices(&previous_string as &str)
|
UnicodeSegmentation::split_word_bound_indices(previous_string as &str)
|
||||||
.filter(|(_, word)| !word.trim_start().is_empty())
|
.filter(|(_, word)| !word.trim_start().is_empty())
|
||||||
.next_back()
|
.next_back()
|
||||||
.map(|(i, previous_word)| {
|
.map(|(i, previous_word)| {
|
||||||
|
|
@ -58,9 +58,8 @@ impl Value {
|
||||||
pub fn next_end_of_word(&self, index: usize) -> usize {
|
pub fn next_end_of_word(&self, index: usize) -> usize {
|
||||||
let next_string = &self.graphemes[index..].concat();
|
let next_string = &self.graphemes[index..].concat();
|
||||||
|
|
||||||
UnicodeSegmentation::split_word_bound_indices(&next_string as &str)
|
UnicodeSegmentation::split_word_bound_indices(next_string as &str)
|
||||||
.filter(|(_, word)| !word.trim_start().is_empty())
|
.find(|(_, word)| !word.trim_start().is_empty())
|
||||||
.next()
|
|
||||||
.map(|(i, next_word)| {
|
.map(|(i, next_word)| {
|
||||||
index
|
index
|
||||||
+ UnicodeSegmentation::graphemes(next_word, true).count()
|
+ UnicodeSegmentation::graphemes(next_word, true).count()
|
||||||
|
|
|
||||||
|
|
@ -162,7 +162,10 @@ where
|
||||||
.horizontal_alignment(self.text_alignment)
|
.horizontal_alignment(self.text_alignment)
|
||||||
.font(self.font.clone())
|
.font(self.font.clone())
|
||||||
.width(self.width)
|
.width(self.width)
|
||||||
.size(self.text_size.unwrap_or(renderer.default_size())),
|
.size(
|
||||||
|
self.text_size
|
||||||
|
.unwrap_or_else(|| renderer.default_size()),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -239,7 +242,7 @@ where
|
||||||
renderer,
|
renderer,
|
||||||
style,
|
style,
|
||||||
label_layout,
|
label_layout,
|
||||||
&label,
|
label,
|
||||||
self.text_size,
|
self.text_size,
|
||||||
self.font.clone(),
|
self.font.clone(),
|
||||||
Default::default(),
|
Default::default(),
|
||||||
|
|
|
||||||
|
|
@ -82,10 +82,18 @@
|
||||||
#![doc(
|
#![doc(
|
||||||
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
||||||
)]
|
)]
|
||||||
#![deny(missing_docs)]
|
#![deny(
|
||||||
#![deny(unused_results)]
|
missing_docs,
|
||||||
#![forbid(unsafe_code)]
|
unused_results,
|
||||||
#![forbid(rust_2018_idioms)]
|
clippy::extra_unused_lifetimes,
|
||||||
|
clippy::from_over_into,
|
||||||
|
clippy::needless_borrow,
|
||||||
|
clippy::new_without_default,
|
||||||
|
clippy::useless_conversion
|
||||||
|
)]
|
||||||
|
#![forbid(rust_2018_idioms, unsafe_code)]
|
||||||
|
#![allow(clippy::inherent_to_string, clippy::type_complexity)]
|
||||||
|
#![cfg_attr(docsrs, feature(doc_cfg))]
|
||||||
|
|
||||||
pub mod flex;
|
pub mod flex;
|
||||||
pub mod helpers;
|
pub mod helpers;
|
||||||
|
|
@ -146,7 +154,7 @@ where
|
||||||
content: impl Into<Element<'a, Message, Renderer>>,
|
content: impl Into<Element<'a, Message, Renderer>>,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
let element = content.into();
|
let element = content.into();
|
||||||
let _ = state.diff(&element);
|
state.diff(&element);
|
||||||
|
|
||||||
Self { state, element }
|
Self { state, element }
|
||||||
}
|
}
|
||||||
|
|
@ -272,13 +280,13 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<iced_native::Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Pure<'a, Message, Renderer>>
|
||||||
for Pure<'a, Message, Renderer>
|
for iced_native::Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: 'a,
|
Message: 'a,
|
||||||
Renderer: iced_native::Renderer + 'a,
|
Renderer: iced_native::Renderer + 'a,
|
||||||
{
|
{
|
||||||
fn into(self) -> iced_native::Element<'a, Message, Renderer> {
|
fn from(pure: Pure<'a, Message, Renderer>) -> Self {
|
||||||
iced_native::Element::new(self)
|
Self::new(pure)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -159,7 +159,7 @@ where
|
||||||
self.height,
|
self.height,
|
||||||
self.padding,
|
self.padding,
|
||||||
|renderer, limits| {
|
|renderer, limits| {
|
||||||
self.content.as_widget().layout(renderer, &limits)
|
self.content.as_widget().layout(renderer, limits)
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
@ -261,14 +261,14 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Button<'a, Message, Renderer>>
|
||||||
for Button<'a, Message, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: Clone + 'a,
|
Message: Clone + 'a,
|
||||||
Renderer: iced_native::Renderer + 'a,
|
Renderer: iced_native::Renderer + 'a,
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(button: Button<'a, Message, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(button)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -96,14 +96,14 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Checkbox<'a, Message, Renderer>>
|
||||||
for Checkbox<'a, Message, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: 'a,
|
Message: 'a,
|
||||||
Renderer: text::Renderer + 'a,
|
Renderer: text::Renderer + 'a,
|
||||||
Renderer::Theme: StyleSheet + widget::text::StyleSheet,
|
Renderer::Theme: StyleSheet + widget::text::StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(checkbox: Checkbox<'a, Message, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(checkbox)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -95,6 +95,12 @@ impl<'a, Message, Renderer> Column<'a, Message, Renderer> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<'a, Message, Renderer> Default for Column<'a, Message, Renderer> {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Widget<Message, Renderer>
|
impl<'a, Message, Renderer> Widget<Message, Renderer>
|
||||||
for Column<'a, Message, Renderer>
|
for Column<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
|
|
@ -228,13 +234,13 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Column<'a, Message, Renderer>>
|
||||||
for Column<'a, Message, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: 'a,
|
Message: 'a,
|
||||||
Renderer: iced_native::Renderer + 'a,
|
Renderer: iced_native::Renderer + 'a,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(column: Column<'a, Message, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(column)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -56,14 +56,14 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer, Handle> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer, Handle> From<Image<Handle>>
|
||||||
for Image<Handle>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: Clone + 'a,
|
Message: Clone + 'a,
|
||||||
Renderer: iced_native::image::Renderer<Handle = Handle> + 'a,
|
Renderer: iced_native::image::Renderer<Handle = Handle> + 'a,
|
||||||
Handle: Clone + Hash + 'a,
|
Handle: Clone + Hash + 'a,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(image: Image<Handle>) -> Self {
|
||||||
Element::new(self)
|
Self::new(image)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -143,7 +143,7 @@ where
|
||||||
self.padding,
|
self.padding,
|
||||||
self.text_size,
|
self.text_size,
|
||||||
&self.font,
|
&self.font,
|
||||||
self.placeholder.as_ref().map(String::as_str),
|
self.placeholder.as_deref(),
|
||||||
&self.options,
|
&self.options,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
@ -199,7 +199,7 @@ where
|
||||||
self.padding,
|
self.padding,
|
||||||
self.text_size,
|
self.text_size,
|
||||||
&self.font,
|
&self.font,
|
||||||
self.placeholder.as_ref().map(String::as_str),
|
self.placeholder.as_deref(),
|
||||||
self.selected.as_ref(),
|
self.selected.as_ref(),
|
||||||
self.style,
|
self.style,
|
||||||
)
|
)
|
||||||
|
|
@ -225,8 +225,8 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, T: 'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, T: 'a, Message, Renderer> From<PickList<'a, T, Message, Renderer>>
|
||||||
for PickList<'a, T, Message, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
T: Clone + ToString + Eq + 'static,
|
T: Clone + ToString + Eq + 'static,
|
||||||
[T]: ToOwned<Owned = Vec<T>>,
|
[T]: ToOwned<Owned = Vec<T>>,
|
||||||
|
|
@ -234,7 +234,7 @@ where
|
||||||
Renderer: text::Renderer + 'a,
|
Renderer: text::Renderer + 'a,
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(pick_list: PickList<'a, T, Message, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(pick_list)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
|
||||||
|
|
||||||
pub use iced_native::widget::progress_bar::*;
|
pub use iced_native::widget::progress_bar::*;
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Widget<Message, Renderer> for ProgressBar<Renderer>
|
impl<Message, Renderer> Widget<Message, Renderer> for ProgressBar<Renderer>
|
||||||
where
|
where
|
||||||
Renderer: iced_native::Renderer,
|
Renderer: iced_native::Renderer,
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
|
|
@ -93,13 +93,13 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<ProgressBar<Renderer>>
|
||||||
for ProgressBar<Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: iced_native::Renderer + 'a,
|
Renderer: iced_native::Renderer + 'a,
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(progress_bar: ProgressBar<Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(progress_bar)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -96,14 +96,14 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Radio<Message, Renderer>>
|
||||||
for Radio<Message, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: 'a + Clone,
|
Message: 'a + Clone,
|
||||||
Renderer: text::Renderer + 'a,
|
Renderer: text::Renderer + 'a,
|
||||||
Renderer::Theme: StyleSheet + widget::text::StyleSheet,
|
Renderer::Theme: StyleSheet + widget::text::StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(radio: Radio<Message, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(radio)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -85,6 +85,12 @@ impl<'a, Message, Renderer> Row<'a, Message, Renderer> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl<'a, Message, Renderer> Default for Row<'a, Message, Renderer> {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self::new()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Widget<Message, Renderer>
|
impl<'a, Message, Renderer> Widget<Message, Renderer>
|
||||||
for Row<'a, Message, Renderer>
|
for Row<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
|
|
@ -215,13 +221,13 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Row<'a, Message, Renderer>>
|
||||||
for Row<'a, Message, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: 'a,
|
Message: 'a,
|
||||||
Renderer: iced_native::Renderer + 'a,
|
Renderer: iced_native::Renderer + 'a,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(row: Row<'a, Message, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(row)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
|
||||||
|
|
||||||
pub use iced_native::widget::rule::*;
|
pub use iced_native::widget::rule::*;
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Widget<Message, Renderer> for Rule<Renderer>
|
impl<Message, Renderer> Widget<Message, Renderer> for Rule<Renderer>
|
||||||
where
|
where
|
||||||
Renderer: iced_native::Renderer,
|
Renderer: iced_native::Renderer,
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
|
|
@ -93,13 +93,13 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Rule<Renderer>>
|
||||||
for Rule<Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: iced_native::Renderer + 'a,
|
Renderer: iced_native::Renderer + 'a,
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(rule: Rule<Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(rule)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ use iced_native::{Clipboard, Length, Point, Rectangle, Shell};
|
||||||
|
|
||||||
pub use iced_native::widget::Space;
|
pub use iced_native::widget::Space;
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Widget<Message, Renderer> for Space
|
impl<Message, Renderer> Widget<Message, Renderer> for Space
|
||||||
where
|
where
|
||||||
Renderer: iced_native::Renderer,
|
Renderer: iced_native::Renderer,
|
||||||
{
|
{
|
||||||
|
|
@ -91,11 +91,11 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> for Space
|
impl<'a, Message, Renderer> From<Space> for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: iced_native::Renderer + 'a,
|
Renderer: iced_native::Renderer + 'a,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(space: Space) -> Self {
|
||||||
Element::new(self)
|
Self::new(space)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -54,12 +54,12 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> for Svg
|
impl<'a, Message, Renderer> From<Svg> for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: Clone + 'a,
|
Message: Clone + 'a,
|
||||||
Renderer: iced_native::svg::Renderer + 'a,
|
Renderer: iced_native::svg::Renderer + 'a,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(svg: Svg) -> Self {
|
||||||
Element::new(self)
|
Self::new(svg)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -55,23 +55,23 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Text<Renderer>>
|
||||||
for Text<Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: text::Renderer + 'a,
|
Renderer: text::Renderer + 'a,
|
||||||
Renderer::Theme: widget::text::StyleSheet,
|
Renderer::Theme: widget::text::StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(text: Text<Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(text)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>> for &'a str
|
impl<'a, Message, Renderer> From<&'a str> for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: text::Renderer + 'a,
|
Renderer: text::Renderer + 'a,
|
||||||
Renderer::Theme: widget::text::StyleSheet,
|
Renderer::Theme: widget::text::StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(contents: &'a str) -> Self {
|
||||||
Text::new(self).into()
|
Text::new(contents).into()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -96,14 +96,14 @@ where
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<'a, Message, Renderer> Into<Element<'a, Message, Renderer>>
|
impl<'a, Message, Renderer> From<Toggler<'a, Message, Renderer>>
|
||||||
for Toggler<'a, Message, Renderer>
|
for Element<'a, Message, Renderer>
|
||||||
where
|
where
|
||||||
Message: 'a,
|
Message: 'a,
|
||||||
Renderer: text::Renderer + 'a,
|
Renderer: text::Renderer + 'a,
|
||||||
Renderer::Theme: StyleSheet + widget::text::StyleSheet,
|
Renderer::Theme: StyleSheet + widget::text::StyleSheet,
|
||||||
{
|
{
|
||||||
fn into(self) -> Element<'a, Message, Renderer> {
|
fn from(toggler: Toggler<'a, Message, Renderer>) -> Self {
|
||||||
Element::new(self)
|
Self::new(toggler)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -215,6 +215,7 @@ pub trait Application: Sized {
|
||||||
where
|
where
|
||||||
Self: 'static,
|
Self: 'static,
|
||||||
{
|
{
|
||||||
|
#[allow(clippy::needless_update)]
|
||||||
let renderer_settings = crate::renderer::Settings {
|
let renderer_settings = crate::renderer::Settings {
|
||||||
default_font: settings.default_font,
|
default_font: settings.default_font,
|
||||||
default_text_size: settings.default_text_size,
|
default_text_size: settings.default_text_size,
|
||||||
|
|
|
||||||
18
src/lib.rs
18
src/lib.rs
|
|
@ -174,12 +174,20 @@
|
||||||
#![doc(
|
#![doc(
|
||||||
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
||||||
)]
|
)]
|
||||||
#![deny(missing_docs)]
|
#![deny(
|
||||||
#![deny(missing_debug_implementations)]
|
missing_debug_implementations,
|
||||||
#![deny(unused_results)]
|
missing_docs,
|
||||||
#![forbid(unsafe_code)]
|
unused_results,
|
||||||
#![forbid(rust_2018_idioms)]
|
clippy::extra_unused_lifetimes,
|
||||||
|
clippy::from_over_into,
|
||||||
|
clippy::needless_borrow,
|
||||||
|
clippy::new_without_default,
|
||||||
|
clippy::useless_conversion
|
||||||
|
)]
|
||||||
|
#![forbid(rust_2018_idioms, unsafe_code)]
|
||||||
|
#![allow(clippy::inherent_to_string, clippy::type_complexity)]
|
||||||
#![cfg_attr(docsrs, feature(doc_cfg))]
|
#![cfg_attr(docsrs, feature(doc_cfg))]
|
||||||
|
|
||||||
mod element;
|
mod element;
|
||||||
mod error;
|
mod error;
|
||||||
mod result;
|
mod result;
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,16 @@
|
||||||
#![doc(
|
#![doc(
|
||||||
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
html_logo_url = "https://raw.githubusercontent.com/iced-rs/iced/9ab6923e943f784985e9ef9ca28b10278297225d/docs/logo.svg"
|
||||||
)]
|
)]
|
||||||
|
#![deny(
|
||||||
|
unused_results,
|
||||||
|
clippy::extra_unused_lifetimes,
|
||||||
|
clippy::from_over_into,
|
||||||
|
clippy::needless_borrow,
|
||||||
|
clippy::new_without_default,
|
||||||
|
clippy::useless_conversion
|
||||||
|
)]
|
||||||
|
#![forbid(unsafe_code, rust_2018_idioms)]
|
||||||
|
#![allow(clippy::inherent_to_string, clippy::type_complexity)]
|
||||||
pub use iced_core::{Background, Color};
|
pub use iced_core::{Background, Color};
|
||||||
|
|
||||||
pub mod application;
|
pub mod application;
|
||||||
|
|
|
||||||
|
|
@ -6,13 +6,7 @@ pub trait StyleSheet {
|
||||||
fn appearance(&self, style: Self::Style) -> Appearance;
|
fn appearance(&self, style: Self::Style) -> Appearance;
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy)]
|
#[derive(Debug, Clone, Copy, Default)]
|
||||||
pub struct Appearance {
|
pub struct Appearance {
|
||||||
pub color: Option<Color>,
|
pub color: Option<Color>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Default for Appearance {
|
|
||||||
fn default() -> Self {
|
|
||||||
Self { color: None }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -419,7 +419,7 @@ impl radio::StyleSheet for Theme {
|
||||||
|
|
||||||
radio::Appearance {
|
radio::Appearance {
|
||||||
background: Color::TRANSPARENT.into(),
|
background: Color::TRANSPARENT.into(),
|
||||||
dot_color: palette.primary.strong.color.into(),
|
dot_color: palette.primary.strong.color,
|
||||||
border_width: 1.0,
|
border_width: 1.0,
|
||||||
border_color: palette.primary.strong.color,
|
border_color: palette.primary.strong.color,
|
||||||
text_color: None,
|
text_color: None,
|
||||||
|
|
@ -431,7 +431,7 @@ impl radio::StyleSheet for Theme {
|
||||||
let palette = self.extended_palette();
|
let palette = self.extended_palette();
|
||||||
|
|
||||||
radio::Appearance {
|
radio::Appearance {
|
||||||
dot_color: palette.primary.strong.color.into(),
|
dot_color: palette.primary.strong.color,
|
||||||
background: palette.primary.weak.color.into(),
|
background: palette.primary.weak.color.into(),
|
||||||
..active
|
..active
|
||||||
}
|
}
|
||||||
|
|
@ -599,7 +599,7 @@ impl scrollable::StyleSheet for Theme {
|
||||||
border_width: 0.0,
|
border_width: 0.0,
|
||||||
border_color: Color::TRANSPARENT,
|
border_color: Color::TRANSPARENT,
|
||||||
scroller: scrollable::Scroller {
|
scroller: scrollable::Scroller {
|
||||||
color: palette.background.strong.color.into(),
|
color: palette.background.strong.color,
|
||||||
border_radius: 2.0,
|
border_radius: 2.0,
|
||||||
border_width: 0.0,
|
border_width: 0.0,
|
||||||
border_color: Color::TRANSPARENT,
|
border_color: Color::TRANSPARENT,
|
||||||
|
|
@ -616,7 +616,7 @@ impl scrollable::StyleSheet for Theme {
|
||||||
border_width: 0.0,
|
border_width: 0.0,
|
||||||
border_color: Color::TRANSPARENT,
|
border_color: Color::TRANSPARENT,
|
||||||
scroller: scrollable::Scroller {
|
scroller: scrollable::Scroller {
|
||||||
color: palette.primary.strong.color.into(),
|
color: palette.primary.strong.color,
|
||||||
border_radius: 2.0,
|
border_radius: 2.0,
|
||||||
border_width: 0.0,
|
border_width: 0.0,
|
||||||
border_color: Color::TRANSPARENT,
|
border_color: Color::TRANSPARENT,
|
||||||
|
|
|
||||||
|
|
@ -93,7 +93,7 @@ impl Backend {
|
||||||
&layer,
|
&layer,
|
||||||
staging_belt,
|
staging_belt,
|
||||||
encoder,
|
encoder,
|
||||||
&frame,
|
frame,
|
||||||
target_size.width,
|
target_size.width,
|
||||||
target_size.height,
|
target_size.height,
|
||||||
);
|
);
|
||||||
|
|
@ -230,7 +230,6 @@ impl Backend {
|
||||||
wgpu_glyph::VerticalAlign::Bottom
|
wgpu_glyph::VerticalAlign::Bottom
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
..Default::default()
|
|
||||||
};
|
};
|
||||||
|
|
||||||
self.text_pipeline.queue(text);
|
self.text_pipeline.queue(text);
|
||||||
|
|
|
||||||
|
|
@ -236,7 +236,7 @@ impl Pipeline {
|
||||||
entries: &[wgpu::BindGroupEntry {
|
entries: &[wgpu::BindGroupEntry {
|
||||||
binding: 0,
|
binding: 0,
|
||||||
resource: wgpu::BindingResource::TextureView(
|
resource: wgpu::BindingResource::TextureView(
|
||||||
&texture_atlas.view(),
|
texture_atlas.view(),
|
||||||
),
|
),
|
||||||
}],
|
}],
|
||||||
});
|
});
|
||||||
|
|
@ -264,7 +264,7 @@ impl Pipeline {
|
||||||
#[cfg(feature = "image_rs")]
|
#[cfg(feature = "image_rs")]
|
||||||
pub fn dimensions(&self, handle: &image::Handle) -> (u32, u32) {
|
pub fn dimensions(&self, handle: &image::Handle) -> (u32, u32) {
|
||||||
let mut cache = self.raster_cache.borrow_mut();
|
let mut cache = self.raster_cache.borrow_mut();
|
||||||
let memory = cache.load(&handle);
|
let memory = cache.load(handle);
|
||||||
|
|
||||||
memory.dimensions()
|
memory.dimensions()
|
||||||
}
|
}
|
||||||
|
|
@ -272,7 +272,7 @@ impl Pipeline {
|
||||||
#[cfg(feature = "svg")]
|
#[cfg(feature = "svg")]
|
||||||
pub fn viewport_dimensions(&self, handle: &svg::Handle) -> (u32, u32) {
|
pub fn viewport_dimensions(&self, handle: &svg::Handle) -> (u32, u32) {
|
||||||
let mut cache = self.vector_cache.borrow_mut();
|
let mut cache = self.vector_cache.borrow_mut();
|
||||||
let svg = cache.load(&handle);
|
let svg = cache.load(handle);
|
||||||
|
|
||||||
svg.viewport_dimensions()
|
svg.viewport_dimensions()
|
||||||
}
|
}
|
||||||
|
|
@ -358,7 +358,7 @@ impl Pipeline {
|
||||||
entries: &[wgpu::BindGroupEntry {
|
entries: &[wgpu::BindGroupEntry {
|
||||||
binding: 0,
|
binding: 0,
|
||||||
resource: wgpu::BindingResource::TextureView(
|
resource: wgpu::BindingResource::TextureView(
|
||||||
&self.texture_atlas.view(),
|
self.texture_atlas.view(),
|
||||||
),
|
),
|
||||||
}],
|
}],
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue