Merge branch 'next'

# Conflicts:
#	Cargo.toml
#	src/graphics.rs
#	src/native/mod.rs
#	src/native/widget.rs
#	src/pure/renderer.rs
#	src/renderer.rs

Author: Joylei

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "plotters-iced"
-version = "0.3.3"
+version = "0.4.0"
 description = "Iced backend for Plotters"
 readme = "README.md"
 license = "MIT"
@@ -19,16 +19,8 @@ members = [".", "examples/split-chart"]
 [dependencies]
 plotters = { version = "0.3", default_features = false }
 plotters-backend = "0.3"
-iced_native = "0.5"
-iced_graphics = { version = "0.3", features = ["canvas", "pure"] }
-iced_pure = { version = "0.2", optional = true }
-
-[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
-num-traits = "0.2"
-libc = "0.2"
-
-[build-dependencies]
-cc = "1.0"
+iced_native = "0.6"
+iced_graphics = { version = "0.4", features = ["canvas"] }
 
 [dev-dependencies]
 plotters = { version = "0.3", default_features = false, features = [
@@ -37,18 +29,10 @@ plotters = { version = "0.3", default_features = false, features = [
     "line_series",
     "point_series",
 ] }
-iced = { version = "0.4.2", features = ["canvas", "tokio", "pure"] }
+iced = { version = "0.5", features = ["canvas", "tokio"] }
 chrono = { version = "0.4", default-features = false }
 rand = "0.8"
+tokio = { version = "1", features = ["rt"], default-features = false }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 sysinfo = { version = "0.26", default_features = false }
-
-[features]
-default = ["native"]
-pure = ["iced_pure", "iced/pure"]
-native = []
-
-[[example]]
-name = "pure_example"
-required-features = ["pure"]

build.rs

@@ -3,16 +3,20 @@
 // Iced backend for Plotters
 // Copyright: 2022, Joylei <[email protected]>
 // License: MIT
+
 extern crate iced;
 extern crate plotters;
 extern crate sysinfo;
 
 use chrono::{DateTime, Utc};
 use iced::{
     alignment::{Horizontal, Vertical},
-    canvas::{Cache, Frame, Geometry},
-    executor, scrollable, Alignment, Application, Column, Command, Container, Element, Font,
-    Length, Row, Scrollable, Settings, Size, Space, Subscription,
+    executor,
+    widget::{
+        canvas::{Cache, Frame, Geometry},
+        Column, Container, Row, Scrollable, Space, Text,
+    },
+    Alignment, Application, Command, Element, Font, Length, Settings, Size, Subscription, Theme,
 };
 use plotters::prelude::ChartBuilder;
 use plotters_backend::DrawingBackend;
@@ -58,6 +62,7 @@ impl Application for State {
     type Message = self::Message;
     type Executor = executor::Default;
     type Flags = ();
+    type Theme = Theme;
 
     fn new(_flags: Self::Flags) -> (Self, Command<Self::Message>) {
         (
@@ -81,14 +86,14 @@ impl Application for State {
         Command::none()
     }
 
-    fn view(&mut self) -> Element<'_, Self::Message> {
+    fn view(&self) -> Element<'_, Self::Message> {
         let content = Column::new()
             .spacing(20)
             .align_items(Alignment::Start)
             .width(Length::Fill)
             .height(Length::Fill)
             .push(
-                iced::Text::new("Iced test chart")
+                Text::new("Iced test chart")
                     .size(TITLE_FONT_SIZE)
                     .font(FONT_BOLD),
             )
@@ -115,7 +120,6 @@ struct SystemChart {
     last_sample_time: Instant,
     items_per_row: usize,
     processors: Vec<CpuUsageChart>,
-    scroll: scrollable::State,
     chart_height: u16,
 }
 
@@ -128,7 +132,6 @@ impl Default for SystemChart {
             last_sample_time: Instant::now(),
             items_per_row: 3,
             processors: Default::default(),
-            scroll: Default::default(),
             chart_height: 300,
         }
     }
@@ -171,20 +174,18 @@ impl SystemChart {
         }
     }
 
-    fn view(&mut self) -> Element<Message> {
+    fn view(&self) -> Element<Message> {
         if !self.is_initialized() {
-            iced::Text::new("Loading...")
+            Text::new("Loading...")
                 .horizontal_alignment(Horizontal::Center)
                 .vertical_alignment(Vertical::Center)
                 .into()
         } else {
-            let mut scroll = Scrollable::new(&mut self.scroll)
-                .width(Length::Fill)
-                .height(Length::Fill);
+            let mut col = Column::new().width(Length::Fill).height(Length::Fill);
 
             let chart_height = self.chart_height;
             let mut idx = 0;
-            for chunk in self.processors.chunks_mut(self.items_per_row) {
+            for chunk in self.processors.chunks(self.items_per_row) {
                 let mut row = Row::new()
                     .spacing(15)
                     .padding(20)
@@ -199,10 +200,10 @@ impl SystemChart {
                     row = row.push(Space::new(Length::Fill, Length::Fill));
                     idx += 1;
                 }
-                scroll = scroll.push(row);
+                col = col.push(row);
             }
 
-            scroll.into()
+            Scrollable::new(col).height(Length::Fill).into()
         }
     }
 }
@@ -239,13 +240,13 @@ impl CpuUsageChart {
         self.cache.clear();
     }
 
-    fn view(&mut self, idx: usize) -> Element<Message> {
+    fn view(&self, idx: usize) -> Element<Message> {
         Container::new(
             Column::new()
                 .width(Length::Fill)
                 .height(Length::Fill)
                 .spacing(5)
-                .push(iced::Text::new(format!("Processor {}", idx)))
+                .push(Text::new(format!("Processor {}", idx)))
                 .push(
                     ChartWidget::new(self).height(Length::Fill).resolve_font(
                         |_, style| match style {
@@ -255,7 +256,6 @@ impl CpuUsageChart {
                     ),
                 ),
         )
-        .style(style::ChartContainer)
         .width(Length::Fill)
         .height(Length::Fill)
         .align_x(Horizontal::Center)
@@ -265,6 +265,7 @@ impl CpuUsageChart {
 }
 
 impl Chart<Message> for CpuUsageChart {
+    type State = ();
     // fn update(
     //     &mut self,
     //     event: Event,
@@ -280,7 +281,7 @@ impl Chart<Message> for CpuUsageChart {
         self.cache.draw(bounds, draw_fn)
     }
 
-    fn build_chart<DB: DrawingBackend>(&self, mut chart: ChartBuilder<DB>) {
+    fn build_chart<DB: DrawingBackend>(&self, _state: &Self::State, mut chart: ChartBuilder<DB>) {
         use plotters::{prelude::*, style::Color};
 
         const PLOT_LINE_COLOR: RGBColor = RGBColor(0, 175, 255);
@@ -307,14 +308,14 @@ impl Chart<Message> for CpuUsageChart {
 
         chart
             .configure_mesh()
-            .bold_line_style(&plotters::style::colors::WHITE.mix(0.1))
-            .light_line_style(&plotters::style::colors::WHITE.mix(0.05))
-            .axis_style(ShapeStyle::from(&plotters::style::colors::WHITE.mix(0.45)).stroke_width(1))
+            .bold_line_style(&plotters::style::colors::BLUE.mix(0.1))
+            .light_line_style(&plotters::style::colors::BLUE.mix(0.05))
+            .axis_style(ShapeStyle::from(&plotters::style::colors::BLUE.mix(0.45)).stroke_width(1))
             .y_labels(10)
             .y_label_style(
                 ("sans-serif", 15)
                     .into_font()
-                    .color(&plotters::style::colors::WHITE.mix(0.65))
+                    .color(&plotters::style::colors::BLUE.mix(0.65))
                     .transform(FontTransform::Rotate90),
             )
             .y_label_formatter(&|y| format!("{}%", y))
@@ -333,18 +334,3 @@ impl Chart<Message> for CpuUsageChart {
             .expect("failed to draw chart data");
     }
 }
-
-mod style {
-    use iced::Color;
-
-    pub struct ChartContainer;
-    impl iced::container::StyleSheet for ChartContainer {
-        fn style(&self) -> iced::container::Style {
-            iced::container::Style {
-                background: Some(Color::BLACK.into()),
-                text_color: Some(Color::WHITE),
-                ..Default::default()
-            }
-        }
-    }
-}