Merge remote-tracking branch 'origin/master' into feat/multi-window-support

# Conflicts: # winit/src/window.rs
2023-02-17 11:45:34 -08:00 · 2023-02-17 11:45:34 -08:00 · 744cef5608
commit 744cef5608
parent 8da098330b 7dc1fb488d
70 changed files with 807 additions and 542 deletions
--- a/examples/integration_wgpu/src/controls.rs
+++ b/examples/integration_wgpu/src/controls.rs
@ -48,7 +48,7 @@ impl Program for Controls {
        let text = &self.text;

        let sliders = Row::new()
-            .width(Length::Units(500))
+            .width(500)
            .spacing(20)
            .push(
                slider(0.0..=1.0, background_color.r, move |r| {