Revert "Merge remote-tracking branch 'upstream/master' into workaroun…

…d-winit-win32-issues"

This reverts commit ecc6207, reversing
changes made to 595a5db.

CHANGELOG.md

@@ -6,128 +6,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Added
-- Multi-window support. [#1964](https://github.com/iced-rs/iced/pull/1964)
-- `TextEditor` widget (or multi-line text input). [#2123](https://github.com/iced-rs/iced/pull/2123)
-- `Shader` widget. [#2085](https://github.com/iced-rs/iced/pull/2085)
-- Shadows. [#1882](https://github.com/iced-rs/iced/pull/1882)
-- Vectorial text for `Canvas`. [#2204](https://github.com/iced-rs/iced/pull/2204)
-- Layout consistency. [#2192](https://github.com/iced-rs/iced/pull/2192)
 - Explicit text caching. [#2058](https://github.com/iced-rs/iced/pull/2058)
-- Gradients in Oklab color space. [#2055](https://github.com/iced-rs/iced/pull/2055)
-- `Themer` widget. [#2209](https://github.com/iced-rs/iced/pull/2209)
-- `Transform` primitive. [#2120](https://github.com/iced-rs/iced/pull/2120)
-- Cut functionality for `TextEditor`. [#2215](https://github.com/iced-rs/iced/pull/2215)
-- Disabled support for `Checkbox`. [#2109](https://github.com/iced-rs/iced/pull/2109)
-- `skip_taskbar` window setting for Windows. [#2211](https://github.com/iced-rs/iced/pull/2211)
-- `fetch_maximized` and `fetch_minimized` window commands. [#2189](https://github.com/iced-rs/iced/pull/2189)
-- `text_shaping` method for `Tooltip`. [#2172](https://github.com/iced-rs/iced/pull/2172)
-- `hovered` styling for `Svg` widget. [#2163](https://github.com/iced-rs/iced/pull/2163)
-- Customizable style for `TextEditor`. [#2159](https://github.com/iced-rs/iced/pull/2159)
-- `RawText` variant for `Primitive` in `iced_graphics`. [#2158](https://github.com/iced-rs/iced/pull/2158)
-- `Stream` support for `Command`. [#2150](https://github.com/iced-rs/iced/pull/2150)
-- Access to bounds/content bounds from a `Scrollable` viewport. [#2072](https://github.com/iced-rs/iced/pull/2072)
-- `Frame::scale_nonuniform` method. [#2070](https://github.com/iced-rs/iced/pull/2070)
-- `theme::Custom::with_fn` to generate completely custom themes. [#2067](https://github.com/iced-rs/iced/pull/2067)
-- `style` attribute for `Font`. [#2041](https://github.com/iced-rs/iced/pull/2041)
-- Texture filtering options for `Image`. [#1894](https://github.com/iced-rs/iced/pull/1894)
-- `default` and `shift_step` methods for `slider` widgets. [#2100](https://github.com/iced-rs/iced/pull/2100)
-- `Custom` variant to `command::Action`. [#2146](https://github.com/iced-rs/iced/pull/2146)
-- Mouse movement events for `MouseArea`. [#2147](https://github.com/iced-rs/iced/pull/2147)
+- `Theme::Custom::with_fn` for custom extended palette generation. [#2067](https://github.com/iced-rs/iced/pull/2067)
 
 ### Changed
-- Enable WebGPU backend in `wgpu` by default instead of WebGL. [#2068](https://github.com/iced-rs/iced/pull/2068)
-- Update `glyphon` to `0.4`. [#2203](https://github.com/iced-rs/iced/pull/2203)
-- Require `Send` on stored pipelines. [#2197](https://github.com/iced-rs/iced/pull/2197)
-- Update `wgpu` to `0.19`, `glyphon` to `0.5`, `softbuffer` to `0.4`, `window-clipboard` to `0.4`, and `raw-window-handle` to `0.6`. [#2191](https://github.com/iced-rs/iced/pull/2191)
-- Update `winit` to `0.29`. [#2169](https://github.com/iced-rs/iced/pull/2169)
-- Provide actual bounds to `Shader` primitives. [#2149](https://github.com/iced-rs/iced/pull/2149)
-- Deny warnings in `test` workflow. [#2135](https://github.com/iced-rs/iced/pull/2135)
-- Update `wgpu` to `0.18` and `cosmic-text` to `0.10`. [#2122](https://github.com/iced-rs/iced/pull/2122)
-- Compute vertex positions in the shader. [#2099](https://github.com/iced-rs/iced/pull/2099)
-- Migrate twox-hash -> xxhash-rust and switch to Xxh3 for better performance. [#2080](https://github.com/iced-rs/iced/pull/2080)
-- Add `keyboard` subscriptions and rename `subscription::events` to `event::listen`. [#2073](https://github.com/iced-rs/iced/pull/2073)
-- Use workspace dependencies and package inheritance. [#2069](https://github.com/iced-rs/iced/pull/2069)
-- Update `wgpu` to `0.17`. [#2065](https://github.com/iced-rs/iced/pull/2065)
-- Support automatic style type casting for `Button`. [#2046](https://github.com/iced-rs/iced/pull/2046)
-- Make `with_clip` and `with_save` in `Frame` able to return the data of the provided closure. [#1994](https://github.com/iced-rs/iced/pull/1994)
-- Use `Radians` for angle fields in `Arc` and `arc::Elliptical`. [#2027](https://github.com/iced-rs/iced/pull/2027)
-- Assert dimensions of quads are normal in `iced_tiny_skia`. [#2082](https://github.com/iced-rs/iced/pull/2082)
-- Remove `position` from `overlay::Element`. [#2226](https://github.com/iced-rs/iced/pull/2226)
+- Updated `wgpu` to `0.17`. [#2065](https://github.com/iced-rs/iced/pull/2065)
+- Changed `Button::style` to take an `impl Into<...>` for consistency. [#2046](https://github.com/iced-rs/iced/pull/2046)
 
 ### Fixed
-- Clipping of `TextInput` selection. [#2199](https://github.com/iced-rs/iced/pull/2199)
-- `Paragraph::grapheme_position` when ligatures are present. [#2196](https://github.com/iced-rs/iced/pull/2196)
-- Docs to include missing feature tags. [#2184](https://github.com/iced-rs/iced/pull/2184)
-- `PaneGrid` click interaction on the top edge. [#2168](https://github.com/iced-rs/iced/pull/2168)
-- `iced_wgpu` not rendering text in SVGs. [#2161](https://github.com/iced-rs/iced/pull/2161)
-- Text clipping. [#2154](https://github.com/iced-rs/iced/pull/2154)
-- Layout invalidation when `Tooltip` changes `overlay`. [#2143](https://github.com/iced-rs/iced/pull/2143)
-- `Overlay` composition. [#2142](https://github.com/iced-rs/iced/pull/2142)
-- Incorrect GIF for the `progress_bar` example. [#2141](https://github.com/iced-rs/iced/pull/2141)
-- Standalone compilation of `iced_renderer` crate. [#2134](https://github.com/iced-rs/iced/pull/2134)
-- Maximize window button enabled when `Settings::resizable` is `false`. [#2124](https://github.com/iced-rs/iced/pull/2124)
-- Width of horizontal scrollbar in `Scrollable`. [#2084](https://github.com/iced-rs/iced/pull/2084)
-- `ComboBox` widget panic on wasm. [#2078](https://github.com/iced-rs/iced/pull/2078)
-- Majority of unresolved documentation links. [#2077](https://github.com/iced-rs/iced/pull/2077)
-- Web examples not running. [#2076](https://github.com/iced-rs/iced/pull/2076)
-- GIFs and video examples broken. [#2074](https://github.com/iced-rs/iced/pull/2074)
-- `@interpolate(flat)` not used as attribute. [#2071](https://github.com/iced-rs/iced/pull/2071)
-- `Checkbox` and `Toggler` hidden behind scrollbar in `styling` example. [#2062](https://github.com/iced-rs/iced/pull/2062)
-- Absolute `LineHeight` sometimes being `0`. [#2059](https://github.com/iced-rs/iced/pull/2059)
-- Paste while holding ALT. [#2006](https://github.com/iced-rs/iced/pull/2006)
-- `Command<T>::perform` to return a `Command<T>`. [#2000](https://github.com/iced-rs/iced/pull/2000)
-- `convert_text` not called on `Svg` trees. [#1908](https://github.com/iced-rs/iced/pull/1908)
-- Unused `backend.rs` file in renderer crate. [#2182](https://github.com/iced-rs/iced/pull/2182)
-- Some `clippy::pedantic` lints. [#2096](https://github.com/iced-rs/iced/pull/2096)
-- Some minor clippy fixes. [#2092](https://github.com/iced-rs/iced/pull/2092)
-- Clippy docs keyword quoting. [#2091](https://github.com/iced-rs/iced/pull/2091)
-- Clippy map transformations. [#2090](https://github.com/iced-rs/iced/pull/2090)
-- Inline format args for ease of reading. [#2089](https://github.com/iced-rs/iced/pull/2089)
-- Stuck scrolling in `Scrollable` with touch events. [#1940](https://github.com/iced-rs/iced/pull/1940)
-- Incorrect unit in `system::Information`. [#2223](https://github.com/iced-rs/iced/pull/2223)
-- `size_hint` not being called from `element::Map`. [#2224](https://github.com/iced-rs/iced/pull/2224)
-- `size_hint` not being called from `element::Explain`. [#2225](https://github.com/iced-rs/iced/pull/2225)
-- Slow touch scrolling for `TextEditor` widget. [#2140](https://github.com/iced-rs/iced/pull/2140)
+- Missing `width` attribute in `styling` example. [#2062](https://github.com/iced-rs/iced/pull/2062)
 
 Many thanks to...
 
 - @akshayr-mecha
-- @alec-deason
-- @arslee07
-- @AustinMReppert
-- @avsaase
-- @blazra
-- @brianch
-- @bungoboingo
-- @Calastrophe
-- @casperstorm
-- @cfrenette
-- @Davidster
-- @Decodetalkers
-- @derezzedex
 - @dtzxporter
-- @GyulyVGC
-- @hicaru
-- @ids1024
-- @Imberflur
-- @jhannyj
-- @jhff
-- @jim-ec
-- @joshuamegnauth54
-- @jpttrssn
-- @lufte
-- @matze
-- @MichalLebeda
-- @MrAntix
-- @nicksenger
-- @Nisatru
-- @nyurik
-- @Remmirad
-- @ripytide
-- @Tahinli
-- @tarkah
-- @tzemanovic
-- @william-shere
 
 ## [0.10.0] - 2023-07-28
 ### Added

core/Cargo.toml

@@ -12,7 +12,6 @@ keywords.workspace = true
 
 [dependencies]
 bitflags.workspace = true
-glam.workspace = true
 log.workspace = true
 num-traits.workspace = true
 smol_str.workspace = true

core/src/angle.rs

@@ -1,7 +1,7 @@
 use crate::{Point, Rectangle, Vector};
 
 use std::f32::consts::{FRAC_PI_2, PI};
-use std::ops::{Add, AddAssign, Div, Mul, RangeInclusive, Sub, SubAssign};
+use std::ops::RangeInclusive;
 
 /// Degrees
 #[derive(Debug, Copy, Clone, PartialEq, PartialOrd)]
@@ -13,26 +13,7 @@ pub struct Radians(pub f32);
 
 impl Radians {
     /// The range of radians of a circle.
-    pub const RANGE: RangeInclusive<Self> = Self(0.0)..=Self(2.0 * PI);
-
-    /// The amount of radians in half a circle.
-    pub const PI: Self = Self(PI);
-
-    /// Calculates the line in which the angle intercepts the `bounds`.
-    pub fn to_distance(&self, bounds: &Rectangle) -> (Point, Point) {
-        let angle = self.0 - FRAC_PI_2;
-        let r = Vector::new(f32::cos(angle), f32::sin(angle));
-
-        let distance_to_rect = f32::max(
-            f32::abs(r.x * bounds.width / 2.0),
-            f32::abs(r.y * bounds.height / 2.0),
-        );
-
-        let start = bounds.center() - r * distance_to_rect;
-        let end = bounds.center() + r * distance_to_rect;
-
-        (start, end)
-    }
+    pub const RANGE: RangeInclusive<Radians> = Radians(0.0)..=Radians(2.0 * PI);
 }
 
 impl From<Degrees> for Radians {
@@ -73,70 +54,20 @@ impl num_traits::FromPrimitive for Radians {
     }
 }
 
-impl Sub for Radians {
-    type Output = Self;
-
-    fn sub(self, rhs: Self) -> Self::Output {
-        Self(self.0 - rhs.0)
-    }
-}
-
-impl SubAssign for Radians {
-    fn sub_assign(&mut self, rhs: Self) {
-        self.0 = self.0 - rhs.0;
-    }
-}
-
-impl Add for Radians {
-    type Output = Self;
-
-    fn add(self, rhs: Self) -> Self::Output {
-        Self(self.0 + rhs.0)
-    }
-}
-
-impl AddAssign for Radians {
-    fn add_assign(&mut self, rhs: Radians) {
-        self.0 = self.0 + rhs.0;
-    }
-}
-
-impl Mul for Radians {
-    type Output = Self;
-
-    fn mul(self, rhs: Radians) -> Self::Output {
-        Radians(self.0 * rhs.0)
-    }
-}
-
-impl Mul<f32> for Radians {
-    type Output = Self;
-
-    fn mul(self, rhs: f32) -> Self::Output {
-        Self(self.0 * rhs)
-    }
-}
-
-impl Mul<Radians> for f32 {
-    type Output = Radians;
-
-    fn mul(self, rhs: Radians) -> Self::Output {
-        Radians(self * rhs.0)
-    }
-}
-
-impl Div<f32> for Radians {
-    type Output = Self;
+impl Radians {
+    /// Calculates the line in which the angle intercepts the `bounds`.
+    pub fn to_distance(&self, bounds: &Rectangle) -> (Point, Point) {
+        let angle = self.0 - FRAC_PI_2;
+        let r = Vector::new(f32::cos(angle), f32::sin(angle));
 
-    fn div(self, rhs: f32) -> Self::Output {
-        Radians(self.0 / rhs)
-    }
-}
+        let distance_to_rect = f32::max(
+            f32::abs(r.x * bounds.width / 2.0),
+            f32::abs(r.y * bounds.height / 2.0),
+        );
 
-impl Div for Radians {
-    type Output = Self;
+        let start = bounds.center() - r * distance_to_rect;
+        let end = bounds.center() + r * distance_to_rect;
 
-    fn div(self, rhs: Self) -> Self::Output {
-        Self(self.0 / rhs.0)
+        (start, end)
     }
 }

core/src/element.rs

@@ -308,10 +308,6 @@ where
         self.widget.size()
     }
 
-    fn size_hint(&self) -> Size<Length> {
-        self.widget.size_hint()
-    }
-
     fn layout(
         &self,
         tree: &mut Tree,
@@ -446,12 +442,11 @@ where
         tree: &'b mut Tree,
         layout: Layout<'_>,
         renderer: &Renderer,
-        translation: Vector,
     ) -> Option<overlay::Element<'b, B, Theme, Renderer>> {
         let mapper = &self.mapper;
 
         self.widget
-            .overlay(tree, layout, renderer, translation)
+            .overlay(tree, layout, renderer)
             .map(move |overlay| overlay.map(mapper))
     }
 }
@@ -482,10 +477,6 @@ where
         self.element.widget.size()
     }
 
-    fn size_hint(&self) -> Size<Length> {
-        self.element.widget.size_hint()
-    }
-
     fn tag(&self) -> tree::Tag {
         self.element.widget.tag()
     }
@@ -597,10 +588,7 @@ where
         state: &'b mut Tree,
         layout: Layout<'_>,
         renderer: &Renderer,
-        translation: Vector,
     ) -> Option<overlay::Element<'b, Message, Theme, Renderer>> {
-        self.element
-            .widget
-            .overlay(state, layout, renderer, translation)
+        self.element.widget.overlay(state, layout, renderer)
     }
 }

core/src/lib.rs

@@ -49,7 +49,6 @@ mod rectangle;
 mod shadow;
 mod shell;
 mod size;
-mod transformation;
 mod vector;
 
 pub use alignment::Alignment;
@@ -76,7 +75,6 @@ pub use shadow::Shadow;
 pub use shell::Shell;
 pub use size::Size;
 pub use text::Text;
-pub use transformation::Transformation;
 pub use vector::Vector;
 pub use widget::Widget;
 

core/src/mouse/interaction.rs

@@ -13,5 +13,4 @@ pub enum Interaction {
     ResizingHorizontally,
     ResizingVertically,
     NotAllowed,
-    ZoomIn,
 }

core/src/overlay.rs

@@ -24,7 +24,13 @@ where
     /// user interface.
     ///
     /// [`Node`]: layout::Node
-    fn layout(&mut self, renderer: &Renderer, bounds: Size) -> layout::Node;
+    fn layout(
+        &mut self,
+        renderer: &Renderer,
+        bounds: Size,
+        position: Point,
+        translation: Vector,
+    ) -> layout::Node;
 
     /// Draws the [`Overlay`] using the associated `Renderer`.
     fn draw(
@@ -114,7 +120,6 @@ pub fn from_children<'a, Message, Theme, Renderer>(
     tree: &'a mut Tree,
     layout: Layout<'_>,
     renderer: &Renderer,
-    translation: Vector,
 ) -> Option<Element<'a, Message, Theme, Renderer>>
 where
     Renderer: crate::Renderer,
@@ -124,9 +129,7 @@ where
         .zip(&mut tree.children)
         .zip(layout.children())
         .filter_map(|((child, state), layout)| {
-            child
-                .as_widget_mut()
-                .overlay(state, layout, renderer, translation)
+            child.as_widget_mut().overlay(state, layout, renderer)
         })
         .collect::<Vec<_>>();