Merge pull request #204 from rizzen-yazston/to_0_12_0

Core updated to iced 0.12.0. Most examples compile.

Cargo.toml

@@ -18,16 +18,16 @@ categories = ["gui"]
 badge = []
 card = []
 date_picker = ["chrono", "once_cell", "icons"]
-color_picker = ["icons", "iced_widget/canvas"]
-cupertino = ["iced_widget/canvas", "time"]
+color_picker = ["icons", "iced/canvas"]
+cupertino = ["time", "iced/canvas"]
 floating_element = []
 grid = ["itertools"]
 glow = []                                                   # TODO
 icons = []
 modal = []
 tab_bar = []
 tabs = ["tab_bar"]
-time_picker = ["chrono", "icons", "iced_widget/canvas"]
+time_picker = ["chrono", "icons", "iced/canvas"]
 wrap = []
 number_input = ["num-traits"]
 selection_list = []
@@ -71,11 +71,11 @@ chrono = { version = "0.4.26", optional = true }
 once_cell = { version = "1.18.0", optional = true }
 itertools = { version = "0.11.0", optional = true }
 
-
-[dependencies.iced_widget]
-git = "https://github.com/iced-rs/iced.git"
+[dependencies.iced]
+#git = "https://github.com/iced-rs/iced.git"
 #rev = "b474a2b7a763dcde6a377cb409001a7b5285ee8d"
-#version = "0.1.1"
+version = "0.12.0"
+features = ["advanced", "lazy", "tokio",]
 
 [profile.dev.package."*"]
 opt-level = 2
@@ -97,10 +97,10 @@ members = [
     "examples/tabs",
     "examples/time_picker",
     "examples/sliderbar",
-    "examples/wrap",
+    #"examples/wrap",
     "examples/selection_list",
     "examples/split",
-    "examples/split_scroller",
+    #"examples/split_scroller",
     "examples/context_menu",
     "examples/spinner",
     "examples/cupertino/cupertino_button",
@@ -112,10 +112,10 @@ members = [
 ]
 
 [workspace.dependencies.iced]
-git = "https://github.com/iced-rs/iced.git"
+#git = "https://github.com/iced-rs/iced.git"
 #rev = "b474a2b7a763dcde6a377cb409001a7b5285ee8d"
-#version = "0.10.0"
-features = ["advanced", "lazy", "tokio"]
+version = "0.12.0"
+features = ["advanced", "lazy", "tokio", "canvas"]
 
 [workspace.dependencies.iced_aw]
 path = "./"

examples/multiple_modals/src/main.rs

@@ -169,9 +169,11 @@ impl Application for MultipleModalsExample {
             match foot_row {
                 Some(foot_row) => container(
                     column![
-                        vertical_space(Length::Fill),
+                        //vertical_space(Length::Fill),
+                        vertical_space(),
                         text(body_string),
-                        vertical_space(Length::Fill),
+                        //vertical_space(Length::Fill),
+                        vertical_space(),
                         foot_row.spacing(20)
                     ]
                     .spacing(20)

examples/split_scroller/src/main.rs

@@ -367,9 +367,11 @@ mod demo {
                         column![
                             scroll_to_end_button(),
                             text("Beginning!"),
-                            vertical_space(1200),
+                            //vertical_space(1200),
+                            vertical_space(),
                             text("Middle!"),
-                            vertical_space(1200),
+                            //vertical_space(1200),
+                            vertical_space(),
                             text("End!"),
                             scroll_to_beginning_button(),
                         ]
@@ -391,9 +393,11 @@ mod demo {
                         row![
                             scroll_to_end_button(),
                             text("Beginning!"),
-                            horizontal_space(1200),
+                            //horizontal_space(1200),
+                            horizontal_space(),
                             text("Middle!"),
-                            horizontal_space(1200),
+                            //horizontal_space(1200),
+                            horizontal_space(),
                             text("End!"),
                             scroll_to_beginning_button(),
                         ]
@@ -415,24 +419,33 @@ mod demo {
                     Direction::Multi => scrollable(
                         //horizontal content
                         row![
-                            column![text("Let's do some scrolling!"), vertical_space(2400)],
+                            column![
+                                text("Let's do some scrolling!"),
+                                //vertical_space(2400),
+                                vertical_space(),
+                            ],
                             scroll_to_end_button(),
                             text("Horizontal - Beginning!"),
-                            horizontal_space(1200),
+                            //horizontal_space(1200),
+                            horizontal_space(),
                             //vertical content
                             column![
                                 text("Horizontal - Middle!"),
                                 scroll_to_end_button(),
                                 text("Vertical - Beginning!"),
-                                vertical_space(1200),
+                                //vertical_space(1200),
+                                vertical_space(),
                                 text("Vertical - Middle!"),
-                                vertical_space(1200),
+                                //vertical_space(1200),
+                                vertical_space(),
                                 text("Vertical - End!"),
                                 scroll_to_beginning_button(),
-                                vertical_space(40),
+                                //vertical_space(40),
+                                vertical_space(),
                             ]
                             .spacing(40),
-                            horizontal_space(1200),
+                            //horizontal_space(1200),
+                            horizontal_space(),
                             text("Horizontal - End!"),
                             scroll_to_beginning_button(),
                         ]

examples/tabs/src/login.rs

@@ -71,7 +71,7 @@ impl Tab for LoginTab {
                         .on_input(LoginMessage::PasswordChanged)
                         .padding(10)
                         .size(32)
-                        .password(),
+                        .secure(true),
                 )
                 .push(
                     Row::new()

src/core/clock.rs

@@ -1,6 +1,6 @@
 //! Helper functions for calculating the clock
 
-use iced_widget::core::Point;
+use iced::Point;
 use std::fmt::Display;
 
 /// The size of the period on the clock based on the clock's size.
@@ -123,7 +123,7 @@ pub fn nearest_radius(
 
 #[cfg(test)]
 mod tests {
-    use iced_widget::core::{Point, Vector};
+    use iced::{Point, Vector};
 
     use super::{circle_points, nearest_point, nearest_radius, NearestRadius};
 

src/core/color.rs

@@ -1,6 +1,6 @@
 //! Helper functions and structs for picking dates.
 
-use iced_widget::core::Color;
+use iced::Color;
 
 /// A color in the HSV color space.
 #[derive(Clone, Copy, Debug, PartialEq)]
@@ -99,7 +99,7 @@ impl From<Hsv> for Color {
 
 #[cfg(test)]
 mod tests {
-    use iced_widget::core::Color;
+    use iced::Color;
 
     use super::Hsv;
 

src/core/overlay.rs

@@ -1,6 +1,6 @@
 //! Helper functions for overlays
 
-use iced_widget::core::{layout, Point, Size};
+use iced::{advanced::layout, Point, Size};
 
 /// Trait containing functions for positioning of nodes.
 pub trait Position {

src/core/renderer.rs

@@ -1,6 +1,6 @@
 //! Helper struct for drawing
 
-use iced_widget::core::{Layout, Point, Rectangle};
+use iced::{advanced::Layout, Point, Rectangle};
 
 /// Collection of all necessary data to draw a widget.
 #[derive(Debug)]

src/graphics/icons.rs

@@ -1,7 +1,7 @@
 //! The default icon font of the widgets of this library.
 
 use cfg_if::cfg_if;
-use iced_widget::core::Font;
+use iced::Font;
 
 cfg_if! {
     if #[cfg(feature = "icons")] {

src/graphics/mod.rs

@@ -8,5 +8,4 @@ pub const SF_UI_ROUNDED_BYTES: &[u8] = include_bytes!("./fonts/SFUIRounded.ttf")
 
 /// The default cupertino font for alerts and button.
 #[cfg(feature = "cupertino")]
-pub const SF_UI_ROUNDED: iced_widget::core::Font =
-    iced_widget::core::Font::with_name(".SF UI Rounded");
+pub const SF_UI_ROUNDED: iced::Font = iced::Font::with_name(".SF UI Rounded");

src/lib.rs

@@ -53,7 +53,7 @@ pub mod native;
 pub mod core;
 pub mod style;
 
-pub use iced_widget::core::Element;
+pub use iced::Element;
 
 /// Exports for all platforms that are not WASM32.
 mod platform {

src/native/badge.rs

@@ -1,14 +1,18 @@
 //! Use a badge for color highlighting important information.
 //!
 //! *This API requires the following crate features to be activated: badge*
-use iced_widget::core::{
-    self, event,
-    layout::{Limits, Node},
+
+use iced::{
+    self,
+    advanced::{
+        layout::{Limits, Node},
+        renderer,
+        widget::Tree,
+        Clipboard, Layout, Shell, Widget,
+    },
+    event,
     mouse::{self, Cursor},
-    renderer,
-    widget::tree::Tree,
-    Alignment, Border, Clipboard, Color, Element, Event, Layout, Length, Padding, Point, Rectangle,
-    Shadow, Shell, Size, Widget,
+    Alignment, Border, Color, Element, Event, Length, Padding, Point, Rectangle, Shadow, Size,
 };
 
 pub use crate::style::badge::{Appearance, StyleSheet};
@@ -30,9 +34,9 @@ const BORDER_RADIUS_RATIO: f32 = 34.0 / 15.0;
 /// let badge = Badge::<Message>::new(Text::new("Text"));
 /// ```
 #[allow(missing_debug_implementations)]
-pub struct Badge<'a, Message, Theme = iced_widget::Theme, Renderer = iced_widget::Renderer>
+pub struct Badge<'a, Message, Theme = iced::Theme, Renderer = iced::Renderer>
 where
-    Renderer: core::Renderer,
+    Renderer: renderer::Renderer,
     Theme: StyleSheet,
 {
     /// The padding of the [`Badge`].
@@ -53,7 +57,7 @@ where
 
 impl<'a, Message, Theme, Renderer> Badge<'a, Message, Theme, Renderer>
 where
-    Renderer: core::Renderer,
+    Renderer: renderer::Renderer,
     Theme: StyleSheet,
 {
     /// Creates a new [`Badge`] with the given content.
@@ -122,7 +126,7 @@ impl<'a, Message, Theme, Renderer> Widget<Message, Theme, Renderer>
     for Badge<'a, Message, Theme, Renderer>
 where
     Message: 'a + Clone,
-    Renderer: 'a + core::Renderer,
+    Renderer: 'a + renderer::Renderer,
     Theme: StyleSheet,
 {
     fn children(&self) -> Vec<Tree> {
@@ -263,7 +267,7 @@ impl<'a, Message, Theme, Renderer> From<Badge<'a, Message, Theme, Renderer>>
     for Element<'a, Message, Theme, Renderer>
 where
     Message: 'a + Clone,
-    Renderer: 'a + core::Renderer,
+    Renderer: 'a + renderer::Renderer,
     Theme: 'a + StyleSheet,
 {
     fn from(badge: Badge<'a, Message, Theme, Renderer>) -> Self {