Merge pull request #2916 from iced-rs/feature/float-widget

`float` widget and other cool stuff

Author: hecrj

beacon/src/client.rs

@@ -48,6 +48,7 @@ pub enum Event {
     MessageLogged { number: usize, message: String },
     CommandsSpawned(usize),
     SubscriptionsTracked(usize),
+    LayersRendered(usize),
 }
 
 impl Client {

beacon/src/lib.rs

@@ -127,6 +127,7 @@ pub fn run() -> impl Stream<Item = Event> {
             let mut last_tasks = 0;
             let mut last_subscriptions = 0;
             let mut last_present_window = None;
+            let mut last_present_layers = 0;
 
             drop(task::spawn(async move {
                 let mut last_message_number = None;
@@ -199,6 +200,9 @@ pub fn run() -> impl Stream<Item = Event> {
                                     ) => {
                                         last_tasks = commands;
                                     }
+                                    client::Event::LayersRendered(layers) => {
+                                        last_present_layers = layers;
+                                    }
                                     client::Event::SpanStarted(
                                         span::Stage::Update,
                                     ) => {
@@ -264,7 +268,10 @@ pub fn run() -> impl Stream<Item = Event> {
                                                 }
                                             }
                                             span::Stage::Present(window) => {
-                                                Span::Present { window }
+                                                Span::Present {
+                                                    window,
+                                                    layers: last_present_layers,
+                                                }
                                             }
                                             span::Stage::Custom(name) => {
                                                 Span::Custom { name }

beacon/src/span.rs

@@ -33,6 +33,7 @@ pub enum Span {
     },
     Present {
         window: window::Id,
+        layers: usize,
     },
     Custom {
         name: String,
@@ -70,7 +71,7 @@ impl Span {
             Span::Draw { window } => Stage::Draw(*window),
             Span::Prepare { primitive, .. } => Stage::Prepare(*primitive),
             Span::Render { primitive, .. } => Stage::Render(*primitive),
-            Span::Present { window } => Stage::Present(*window),
+            Span::Present { window, .. } => Stage::Present(*window),
             Span::Custom { name, .. } => Stage::Custom(name.clone()),
         }
     }

benches/wgpu.rs

@@ -179,9 +179,10 @@ fn scene<'a, Message: 'a>(n: usize) -> Element<'a, Message, Theme, Renderer> {
                         size: Pixels::from(16),
                         line_height: text::LineHeight::default(),
                         font: Font::DEFAULT,
-                        align_x: alignment::Horizontal::Left,
+                        align_x: text::Alignment::Left,
                         align_y: alignment::Vertical::Top,
                         shaping: text::Shaping::Basic,
+                        max_width: f32::INFINITY,
                     });
                 }
             })]

core/src/element.rs

@@ -366,7 +366,7 @@ where
     fn overlay<'b>(
         &'b mut self,
         tree: &'b mut Tree,
-        layout: Layout<'_>,
+        layout: Layout<'b>,
         renderer: &Renderer,
         viewport: &Rectangle,
         translation: Vector,
@@ -518,7 +518,7 @@ where
     fn overlay<'b>(
         &'b mut self,
         state: &'b mut Tree,
-        layout: Layout<'_>,
+        layout: Layout<'b>,
         renderer: &Renderer,
         viewport: &Rectangle,
         translation: Vector,

core/src/overlay.rs

@@ -120,7 +120,7 @@ where
 pub fn from_children<'a, Message, Theme, Renderer>(
     children: &'a mut [crate::Element<'_, Message, Theme, Renderer>],
     tree: &'a mut Tree,
-    layout: Layout<'_>,
+    layout: Layout<'a>,
     renderer: &Renderer,
     viewport: &Rectangle,
     translation: Vector,

core/src/transformation.rs

@@ -13,22 +13,27 @@ impl Transformation {
 
     /// Creates an orthographic projection.
     #[rustfmt::skip]
-    pub fn orthographic(width: u32, height: u32) -> Transformation {
-        Transformation(Mat4::orthographic_rh_gl(
+    pub fn orthographic(width: u32, height: u32) -> Self{
+        Self(Mat4::orthographic_rh_gl(
             0.0, width as f32,
             height as f32, 0.0,
             -1.0, 1.0
         ))
     }
 
     /// Creates a translate transformation.
-    pub fn translate(x: f32, y: f32) -> Transformation {
-        Transformation(Mat4::from_translation(Vec3::new(x, y, 0.0)))
+    pub fn translate(x: f32, y: f32) -> Self {
+        Self(Mat4::from_translation(Vec3::new(x, y, 0.0)))
     }
 
     /// Creates a uniform scaling transformation.
-    pub fn scale(scaling: f32) -> Transformation {
-        Transformation(Mat4::from_scale(Vec3::new(scaling, scaling, 1.0)))
+    pub fn scale(scaling: f32) -> Self {
+        Self(Mat4::from_scale(Vec3::new(scaling, scaling, 1.0)))
+    }
+
+    /// Returns the inverse of the [`Transformation`].
+    pub fn inverse(self) -> Self {
+        Self(self.0.inverse())
     }
 
     /// Returns the scale factor of the [`Transformation`].
@@ -52,7 +57,7 @@ impl Mul for Transformation {
     type Output = Self;
 
     fn mul(self, rhs: Self) -> Self {
-        Transformation(self.0 * rhs.0)
+        Self(self.0 * rhs.0)
     }
 }
 

core/src/widget.rs

@@ -144,7 +144,7 @@ where
     fn overlay<'a>(
         &'a mut self,
         _state: &'a mut Tree,
-        _layout: Layout<'_>,
+        _layout: Layout<'a>,
         _renderer: &Renderer,
         _viewport: &Rectangle,
         _translation: Vector,

debug/src/lib.rs

@@ -43,11 +43,15 @@ pub fn theme_changed(f: impl FnOnce() -> Option<theme::Palette>) {
 }
 
 pub fn tasks_spawned(amount: usize) {
-    internal::tasks_spawned(amount)
+    internal::tasks_spawned(amount);
 }
 
 pub fn subscriptions_tracked(amount: usize) {
-    internal::subscriptions_tracked(amount)
+    internal::subscriptions_tracked(amount);
+}
+
+pub fn layers_rendered(amount: impl FnOnce() -> usize) {
+    internal::layers_rendered(amount);
 }
 
 pub fn boot() -> Span {
@@ -157,6 +161,10 @@ mod internal {
         log(client::Event::SubscriptionsTracked(amount));
     }
 
+    pub fn layers_rendered(amount: impl FnOnce() -> usize) {
+        log(client::Event::LayersRendered(amount()));
+    }
+
     pub fn boot() -> Span {
         span(span::Stage::Boot)
     }
@@ -300,8 +308,6 @@ mod internal {
     use crate::futures::Subscription;
     use crate::{Command, Primitive};
 
-    use std::io;
-
     pub fn enable() {}
     pub fn disable() {}
 
@@ -317,6 +323,8 @@ mod internal {
 
     pub fn subscriptions_tracked(_amount: usize) {}
 
+    pub fn layers_rendered(_amount: impl FnOnce() -> usize) {}
+
     pub fn boot() -> Span {
         Span
     }

devtools/src/comet.rs

@@ -4,7 +4,7 @@ use crate::runtime::Task;
 use std::process;
 
 pub const COMPATIBLE_REVISION: &str =
-    "69dd2283886dccdaa1ee6e1c274af62f7250bc38";
+    "63f30c779a72315598255703f35af44f8ec3e583";
 
 pub fn launch() -> Task<launch::Result> {
     executor::try_spawn_blocking(|mut sender| {