Merge branch 'RequestUserAttention' of https://github.com/Night-Hunter-NF/iced into RequestUserAttention

Author: n1ght-hunter

.github/ISSUE_TEMPLATE/BUG-REPORT.yml

@@ -58,12 +58,12 @@ body:
     attributes:
       label: Version
       description: |
-        We only offer support for the `0.4` release on crates.io and the `master` branch on this repository. Which version are you using? Please make sure you are using the latest patch available (e.g. run `cargo update`).
+        We only offer support for the latest release on crates.io and the `master` branch on this repository. Which version are you using? Please make sure you are using the latest patch available (e.g. run `cargo update`).
 
-        If you are using an older release, please upgrade to `0.4` before filing an issue.
+        If you are using an older release, please upgrade to the latest one before filing an issue.
       options:
         - master
-        - 0.4
+        - 0.6
     validations:
       required: true
   - type: dropdown

core/src/rectangle.rs

@@ -116,8 +116,8 @@ impl std::ops::Mul<f32> for Rectangle<f32> {
 
     fn mul(self, scale: f32) -> Self {
         Self {
-            x: self.x as f32 * scale,
-            y: self.y as f32 * scale,
+            x: self.x * scale,
+            y: self.y * scale,
             width: self.width * scale,
             height: self.height * scale,
         }

examples/game_of_life/src/main.rs

@@ -492,8 +492,10 @@ mod grid {
                                 let old_scaling = self.scaling;
 
                                 let scaling = (self.scaling * (1.0 + y / 30.0))
-                                    .max(Self::MIN_SCALING)
-                                    .min(Self::MAX_SCALING);
+                                    .clamp(
+                                        Self::MIN_SCALING,
+                                        Self::MAX_SCALING,
+                                    );
 
                                 let translation =
                                     if let Some(cursor_to_center) =

examples/modal/src/main.rs

@@ -325,11 +325,13 @@ mod modal {
             &self,
             state: &mut Tree,
             layout: Layout<'_>,
+            renderer: &Renderer,
             operation: &mut dyn widget::Operation<Message>,
         ) {
             self.base.as_widget().operate(
                 &mut state.children[0],
                 layout,
+                renderer,
                 operation,
             );
         }
@@ -436,11 +438,13 @@ mod modal {
         fn operate(
             &mut self,
             layout: Layout<'_>,
+            renderer: &Renderer,
             operation: &mut dyn widget::Operation<Message>,
         ) {
             self.content.as_widget().operate(
                 self.tree,
                 layout.children().next().unwrap(),
+                renderer,
                 operation,
             );
         }

examples/slider/Cargo.toml

@@ -0,0 +1,9 @@
+[package]
+name = "slider"
+version = "0.1.0"
+authors = ["Casper Rogild Storm<casper@rogildstorm.com>"]
+edition = "2021"
+publish = false
+
+[dependencies]
+iced = { path = "../.." }

examples/slider/README.md

@@ -0,0 +1,14 @@
+## Slider
+
+A `Slider` is a bar and a handle that selects a single value from a range of values.
+There exists both `Slider` and `VerticalSlider` depending on which orientation you need.
+
+<div align="center">
+    <img src="sliders.gif">
+</div>
+
+You can run it with `cargo run`:
+
+```
+cargo run --package slider
+```

examples/slider/sliders.gif

@@ -0,0 +1,63 @@
+use iced::widget::{column, container, slider, text, vertical_slider};
+use iced::{Element, Length, Sandbox, Settings};
+
+pub fn main() -> iced::Result {
+    Slider::run(Settings::default())
+}
+
+#[derive(Debug, Clone)]
+pub enum Message {
+    SliderChanged(u8),
+}
+
+pub struct Slider {
+    slider_value: u8,
+}
+
+impl Sandbox for Slider {
+    type Message = Message;
+
+    fn new() -> Slider {
+        Slider { slider_value: 50 }
+    }
+
+    fn title(&self) -> String {
+        String::from("Slider - Iced")
+    }
+
+    fn update(&mut self, message: Message) {
+        match message {
+            Message::SliderChanged(value) => {
+                self.slider_value = value;
+            }
+        }
+    }
+
+    fn view(&self) -> Element<Message> {
+        let value = self.slider_value;
+
+        let h_slider =
+            container(slider(0..=100, value, Message::SliderChanged))
+                .width(Length::Units(250));
+
+        let v_slider =
+            container(vertical_slider(0..=100, value, Message::SliderChanged))
+                .height(Length::Units(200));
+
+        let text = text(format!("{value}"));
+
+        container(
+            column![
+                container(v_slider).width(Length::Fill).center_x(),
+                container(h_slider).width(Length::Fill).center_x(),
+                container(text).width(Length::Fill).center_x(),
+            ]
+            .spacing(25),
+        )
+        .height(Length::Fill)
+        .width(Length::Fill)
+        .center_x()
+        .center_y()
+        .into()
+    }
+}

examples/slider/src/main.rs

@@ -1,6 +1,6 @@
 [package]
 name = "iced_glow"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"]
 edition = "2021"
 description = "A glow renderer for iced"

glow/Cargo.toml

@@ -192,7 +192,7 @@ impl Pipeline {
                 }
 
                 #[cfg(not(feature = "svg"))]
-                layer::Image::Vector { handle: _, bounds } => (None, bounds),
+                layer::Image::Vector { bounds, .. } => (None, bounds),
             };
 
             unsafe {