summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG.md13
-rw-r--r--README.md2
-rw-r--r--core/src/rectangle.rs4
-rw-r--r--graphics/src/geometry/path/arc.rs12
-rw-r--r--src/lib.rs2
-rw-r--r--widget/src/text_input.rs4
6 files changed, 24 insertions, 13 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8e838f8d..e69b26eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -41,7 +41,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Nix instructions to `DEPENDENCIES.md`. [#1859](https://github.com/iced-rs/iced/pull/1859)
- Loading spinners example. [#1902](https://github.com/iced-rs/iced/pull/1902)
- Workflow that verifies `CHANGELOG` is always up-to-date. [#1970](https://github.com/iced-rs/iced/pull/1970)
-- Keybinds to cycle `ComboBox` options. [#1991](https://github.com/iced-rs/iced/pull/1991)
- Outdated mentions of `iced_native` in `README`. [#1979](https://github.com/iced-rs/iced/pull/1979)
### Changed
@@ -77,11 +76,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Quad rendering including border only inside of the bounds. [#1843](https://github.com/iced-rs/iced/pull/1843)
- Redraw requests not being forwarded for `Component` overlays. [#1949](https://github.com/iced-rs/iced/pull/1949)
- Blinking input cursor when window loses focus. [#1955](https://github.com/iced-rs/iced/pull/1955)
-- `Tooltip` overlay position inside `Scrollable`. [#1978](https://github.com/iced-rs/iced/pull/1978)
- `BorderRadius` not exposed in root crate. [#1972](https://github.com/iced-rs/iced/pull/1972)
- Outdated `ROADMAP`. [#1958](https://github.com/iced-rs/iced/pull/1958)
+
+### Patched
+- Keybinds to cycle `ComboBox` options. [#1991](https://github.com/iced-rs/iced/pull/1991)
+- `Tooltip` overlay position inside `Scrollable`. [#1978](https://github.com/iced-rs/iced/pull/1978)
- `iced_wgpu` freezing on empty layers. [#1996](https://github.com/iced-rs/iced/pull/1996)
- `image::Viewer` reacting to any scroll event. [#1998](https://github.com/iced-rs/iced/pull/1998)
+- `TextInput` pasting text when `Alt` key is pressed. [#2006](https://github.com/iced-rs/iced/pull/2006)
+- Broken link to old `iced_native` crate in `README`. [#2024](https://github.com/iced-rs/iced/pull/2024)
+- `Rectangle::contains` being non-exclusive. [#2017](https://github.com/iced-rs/iced/pull/2017)
+- Documentation for `Arc` and `arc::Elliptical`. [#2008](https://github.com/iced-rs/iced/pull/2008)
Many thanks to...
@@ -94,6 +100,7 @@ Many thanks to...
- @clarkmoody
- @Davidster
- @Drakulix
+- @genusistimelord
- @GyulyVGC
- @ids1024
- @jhff
@@ -103,11 +110,13 @@ Many thanks to...
- @malramsay64
- @nicksenger
- @nicoburns
+- @NyxAlexandra
- @Redhawk18
- @RGBCube
- @rs017991
- @tarkah
- @thunderstorm010
+- @ua-kxie
- @wash2
- @wiiznokes
diff --git a/README.md b/README.md
index 9604aadb..508413e6 100644
--- a/README.md
+++ b/README.md
@@ -50,7 +50,7 @@ __Iced is currently experimental software.__ [Take a look at the roadmap],
[scrollables]: https://gfycat.com/perkybaggybaboon-rust-gui
[Debug overlay with performance metrics]: https://gfycat.com/incredibledarlingbee
[Modular ecosystem]: ECOSYSTEM.md
-[renderer-agnostic native runtime]: native/
+[renderer-agnostic native runtime]: runtime/
[`wgpu`]: https://github.com/gfx-rs/wgpu
[`tiny-skia`]: https://github.com/RazrFalcon/tiny-skia
[`iced_wgpu`]: wgpu/
diff --git a/core/src/rectangle.rs b/core/src/rectangle.rs
index db56aa18..c1c2eeac 100644
--- a/core/src/rectangle.rs
+++ b/core/src/rectangle.rs
@@ -74,9 +74,9 @@ impl Rectangle<f32> {
/// Returns true if the given [`Point`] is contained in the [`Rectangle`].
pub fn contains(&self, point: Point) -> bool {
self.x <= point.x
- && point.x <= self.x + self.width
+ && point.x < self.x + self.width
&& self.y <= point.y
- && point.y <= self.y + self.height
+ && point.y < self.y + self.height
}
/// Returns true if the current [`Rectangle`] is completely within the given
diff --git a/graphics/src/geometry/path/arc.rs b/graphics/src/geometry/path/arc.rs
index 2cdebb66..dd4fcf33 100644
--- a/graphics/src/geometry/path/arc.rs
+++ b/graphics/src/geometry/path/arc.rs
@@ -8,9 +8,9 @@ pub struct Arc {
pub center: Point,
/// The radius of the arc.
pub radius: f32,
- /// The start of the segment's angle, clockwise rotation.
+ /// The start of the segment's angle in radians, clockwise rotation from positive x-axis.
pub start_angle: f32,
- /// The end of the segment's angle, clockwise rotation.
+ /// The end of the segment's angle in radians, clockwise rotation from positive x-axis.
pub end_angle: f32,
}
@@ -19,13 +19,13 @@ pub struct Arc {
pub struct Elliptical {
/// The center of the arc.
pub center: Point,
- /// The radii of the arc's ellipse, defining its axes.
+ /// The radii of the arc's ellipse. The horizontal and vertical half-dimensions of the ellipse will match the x and y values of the radii vector.
pub radii: Vector,
- /// The rotation of the arc's ellipse.
+ /// The clockwise rotation of the arc's ellipse.
pub rotation: f32,
- /// The start of the segment's angle, clockwise rotation.
+ /// The start of the segment's angle in radians, clockwise rotation from positive x-axis.
pub start_angle: f32,
- /// The end of the segment's angle, clockwise rotation.
+ /// The end of the segment's angle in radians, clockwise rotation from positive x-axis.
pub end_angle: f32,
}
diff --git a/src/lib.rs b/src/lib.rs
index 19e7456e..ff87e245 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -86,7 +86,7 @@
//! use iced::widget::{button, column, text, Column};
//!
//! impl Counter {
-//! pub fn view(&mut self) -> Column<Message> {
+//! pub fn view(&self) -> Column<Message> {
//! // We use a column: a simple vertical layout
//! column![
//! // The increment button. We tell it to produce an
diff --git a/widget/src/text_input.rs b/widget/src/text_input.rs
index b899eb67..ef6d31ac 100644
--- a/widget/src/text_input.rs
+++ b/widget/src/text_input.rs
@@ -842,7 +842,9 @@ where
shell.publish(message);
}
keyboard::KeyCode::V => {
- if state.keyboard_modifiers.command() {
+ if state.keyboard_modifiers.command()
+ && !state.keyboard_modifiers.alt()
+ {
let content = match state.is_pasting.take() {
Some(content) => content,
None => {