Merge pull request #42 from BillyDM/iced13

Iced 0.13

Author: BillyDM

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iced_baseview"
-version = "0.0.3"
+version = "0.1.0"
 authors = [
   "Billy Messenger <BillyDM@protonmail.com>",
   "Robbert van der Helm <mail@robbertvanderhelm.nl>",
@@ -15,24 +15,30 @@ keywords = ["gui", "ui", "graphics", "interface", "widgets"]
 categories = ["gui"]
 
 [features]
+default = ["wgpu"]
 # Enables a debug view in native platforms (press F12)
 debug = ["iced_runtime/debug"]
 # Enable the wgu renderer
-wgpu = ["iced_renderer/wgpu"]
-image = ["iced_widget/image"]
-svg = ["iced_widget/svg"]
+wgpu = ["iced_renderer/wgpu", "iced_widget/wgpu"]
+image = ["iced_graphics/image", "iced_widget/image", "iced_renderer/image"]
+svg = ["iced_graphics/svg", "iced_widget/svg", "iced_renderer/svg"]
+geometry = ["iced_graphics/geometry", "iced_renderer/geometry"]
+web-colors = ["iced_graphics/web-colors", "iced_renderer/web-colors"]
 canvas = ["iced_widget/canvas"]
+system = ["dep:sysinfo"]
+trace = []
 
 [dependencies]
-baseview = { git = "https://github.com/RustAudio/baseview.git", rev = "fdb43ea" }
+baseview = { git = "https://github.com/RustAudio/baseview.git", rev = "579130ecb4f9f315ae52190af42f0ea46aeaa4a2" }
 cfg-if = "1"
-copypasta = "0.8"
-iced_runtime = "0.1"
-iced_renderer = "0.1"
-iced_graphics = "0.9"
-iced_style = "0.9"
-iced_widget = "0.1"
+window_clipboard = "0.4.1"
+iced_runtime = "0.13"
+iced_renderer = "0.13"
+iced_graphics = "0.13"
+iced_widget = "0.13"
 keyboard-types = { version = "0.6", default-features = false }
 log = "0.4"
 raw-window-handle = "0.5"
+raw-window-handle-06 = { package = "raw-window-handle", version = "0.6" }
 thiserror = "1.0"
+sysinfo = { version = "0.30", optional = true }

README.md

@@ -4,19 +4,19 @@
 [![Crates.io](https://img.shields.io/crates/v/iced_baseview.svg)](https://crates.io/crates/iced_baseview)
 [![License](https://img.shields.io/crates/l/iced_baseview.svg)](https://github.com/BillyDM/iced_baseview/blob/main/LICENSE)
 
-A [`baseview`] backend for the [`Iced`] GUI library.
+A [baseview] backend for the [Iced] GUI library
 
 <div align="center">
     <img src="screenshot.png">
 </div>
 
 The [main branch](https://github.com/BillyDM/iced_baseview/tree/main) of this repository tracks the latest crates.io release of iced, while [iced_git  branch](https://github.com/BillyDM/iced_baseview/tree/iced_git) tracks its git repository.
 
-## VST / LV2 / AU Plugins
+## VST3 / CLAP / AU Plugins
 
 Examples of how to use this library for audio plugins can be found here:
-* [`iced-baseplug-examples`]
+* [nih_plug_iced](https://github.com/robbert-vdh/nih-plug/tree/master/nih_plug_iced)
+* [iced-baseplug-examples](https://github.com/BillyDM/iced-baseplug-examples)
 
-[`Iced`]: https://github.com/hecrj/iced
-[`baseview`]: https://github.com/RustAudio/baseview
-[`iced-baseplug-examples`]: https://github.com/BillyDM/iced-baseplug-examples
+[Iced]: https://github.com/hecrj/iced
+[baseview]: https://github.com/RustAudio/baseview

examples/counter.rs

@@ -0,0 +1,86 @@
+use iced_baseview::{
+    baseview::{Size, WindowOpenOptions, WindowScalePolicy},
+    settings::IcedBaseviewSettings,
+    widget::{button, column, text},
+    Application, Center, Element, Renderer, Settings, Task, Theme,
+};
+
+fn main() {
+    let settings = Settings {
+        window: WindowOpenOptions {
+            title: String::from("iced_baseview counter demo"),
+            size: Size::new(500.0, 300.0),
+            scale: WindowScalePolicy::SystemScaleFactor,
+        },
+        graphics_settings: iced_graphics::Settings {
+            ..Default::default()
+        },
+        iced_baseview: IcedBaseviewSettings {
+            ..Default::default()
+        },
+        ..Default::default()
+    };
+
+    iced_baseview::open_blocking::<MyProgram>(Flags::default(), settings);
+}
+
+#[derive(Default)]
+struct Flags {
+    initial_value: i64,
+}
+
+#[derive(Debug, Clone, Copy)]
+enum Message {
+    Increment,
+    Decrement,
+}
+
+struct MyProgram {
+    value: i64,
+}
+
+impl Application for MyProgram {
+    type Message = Message;
+    type Flags = Flags;
+    type Theme = Theme;
+    type Executor = iced_baseview::executor::Default;
+
+    fn new(flags: Flags) -> (Self, Task<Self::Message>) {
+        (
+            Self {
+                value: flags.initial_value,
+            },
+            Task::none(),
+        )
+    }
+
+    fn update(&mut self, message: Self::Message) -> Task<Self::Message> {
+        match message {
+            Message::Increment => {
+                self.value += 1;
+            }
+            Message::Decrement => {
+                self.value -= 1;
+            }
+        }
+
+        dbg!(self.value);
+
+        Task::none()
+    }
+
+    fn view(&self) -> Element<'_, Self::Message, Self::Theme, Renderer> {
+        column![
+            button("Increment").on_press(Message::Increment),
+            text(self.value).size(50),
+            button("Decrement").on_press(Message::Decrement)
+        ]
+        .padding(20)
+        .align_x(Center)
+        .into()
+    }
+
+    fn theme(&self) -> Self::Theme {
+        Theme::Dark
+    }
+}

examples/custom_styles.rs

@@ -1,14 +1,7 @@
 use iced_baseview::{
     baseview::{Size, WindowOpenOptions, WindowScalePolicy},
-    core::{Alignment, Element, Length},
-    open_blocking,
-    runtime::Command,
-    settings::IcedBaseviewSettings,
-    widget::Column,
-    widget::Container,
-    widget::Rule,
-    widget::Text,
-    Application, Settings,
+    widget::{Column, Container, Rule, Text},
+    Alignment, Application, Element, Length, Renderer, Settings, Task, Theme,
 };
 
 fn main() {
@@ -18,56 +11,47 @@ fn main() {
             size: Size::new(500.0, 300.0),
             scale: WindowScalePolicy::SystemScaleFactor,
         },
-        iced_baseview: IcedBaseviewSettings {
-            ignore_non_modifier_keys: false,
-            always_redraw: true,
-        },
-        flags: (),
-        fonts: Default::default(),
+        ..Default::default()
     };
 
-    open_blocking::<MyProgram>(settings);
+    iced_baseview::open_blocking::<MyProgram>((), settings);
 }
 
 struct MyProgram;
 
 impl Application for MyProgram {
-    type Executor = iced_baseview::executor::Default;
     type Message = ();
-    type Theme = iced_baseview::style::Theme;
     type Flags = ();
+    type Theme = Theme;
+    type Executor = iced_baseview::executor::Default;
 
-    fn new(_flags: ()) -> (Self, Command<Self::Message>) {
-        (Self {}, Command::none())
+    fn new(_flags: ()) -> (Self, Task<Self::Message>) {
+        (Self {}, Task::none())
     }
+
     fn title(&self) -> String {
         "Hello World!".into()
     }
-    fn update(&mut self, _message: Self::Message) -> Command<Self::Message> {
-        Command::none()
+
+    fn update(&mut self, _message: Self::Message) -> Task<Self::Message> {
+        Task::none()
     }
 
-    fn view(
-        &self,
-    ) -> Element<'_, Self::Message, iced_baseview::widget::renderer::Renderer<Self::Theme>> {
+    fn view(&self) -> Element<'_, Self::Message, Self::Theme, Renderer> {
         let content = Column::new()
             .width(Length::Fill)
-            .align_items(Alignment::Center)
+            .align_x(Alignment::Center)
             .push(Text::new("Hello World!"))
             .push(Rule::horizontal(10));
 
         Container::new(content)
             .width(Length::Fill)
             .height(Length::Fill)
-            .center_x()
-            .center_y()
+            .center(Length::Fill)
             .into()
     }
 
-    fn renderer_settings() -> iced_renderer::Settings {
-        iced_renderer::Settings {
-            antialiasing: Some(iced_graphics::Antialiasing::MSAAx4),
-            ..Default::default()
-        }
+    fn theme(&self) -> Self::Theme {
+        Theme::Dark
     }
 }