From 9957b071438a9fcee502641faac8bc4354d45c40 Mon Sep 17 00:00:00 2001
From: Felix Zwettler <f.zwettler@posteo.de>
Date: Tue, 15 Aug 2023 17:34:01 +0200
Subject: [PATCH 01/10] add polyline shape and builder

---
 crates/rnote-compose/src/builders/mod.rs      |  11 +-
 .../src/builders/polylinebuilder.rs           | 139 +++++++++
 crates/rnote-compose/src/meson.build          |   2 +
 crates/rnote-compose/src/penevents.rs         |   2 +-
 crates/rnote-compose/src/shapes/line.rs       |   5 +
 crates/rnote-compose/src/shapes/mod.rs        |  25 +-
 crates/rnote-compose/src/shapes/polyline.rs   |  99 +++++++
 crates/rnote-compose/src/shapes/shape.rs      |  16 +-
 crates/rnote-compose/src/style/mod.rs         |  22 +-
 crates/rnote-compose/src/style/rough/mod.rs   |  29 +-
 crates/rnote-compose/src/style/smooth/mod.rs  |  35 ++-
 crates/rnote-engine/src/pens/shaper.rs        |   3 +-
 .../shapebuilder-polyline-symbolic.svg        | 275 ++++++++++++++++++
 .../rnote-ui/data/resources.gresource.xml.in  |  11 +-
 crates/rnote-ui/src/penssidebar/shaperpage.rs |   2 +
 15 files changed, 655 insertions(+), 21 deletions(-)
 create mode 100644 crates/rnote-compose/src/builders/polylinebuilder.rs
 create mode 100644 crates/rnote-compose/src/shapes/polyline.rs
 create mode 100644 crates/rnote-ui/data/icons/scalable/actions/shapebuilder-polyline-symbolic.svg

diff --git a/crates/rnote-compose/src/builders/mod.rs b/crates/rnote-compose/src/builders/mod.rs
index 5eac7aa471..5dacde8c1c 100644
--- a/crates/rnote-compose/src/builders/mod.rs
+++ b/crates/rnote-compose/src/builders/mod.rs
@@ -11,6 +11,7 @@ mod penpathbuildable;
 mod penpathcurvedbuilder;
 mod penpathmodeledbuilder;
 mod penpathsimplebuilder;
+mod polylinebuilder;
 mod quadbezbuilder;
 mod quadrantcoordsystem2dbuilder;
 mod rectanglebuilder;
@@ -31,6 +32,7 @@ pub use penpathbuildable::PenPathBuilderProgress;
 pub use penpathcurvedbuilder::PenPathCurvedBuilder;
 pub use penpathmodeledbuilder::PenPathModeledBuilder;
 pub use penpathsimplebuilder::PenPathSimpleBuilder;
+pub use polylinebuilder::PolylineBuilder;
 pub use quadbezbuilder::QuadBezBuilder;
 pub use quadrantcoordsystem2dbuilder::QuadrantCoordSystem2DBuilder;
 pub use rectanglebuilder::RectangleBuilder;
@@ -75,12 +77,15 @@ pub enum ShapeBuilderType {
     /// A foci ellipse builder
     #[serde(rename = "foci_ellipse")]
     FociEllipse,
-    /// An quadbez builder
+    /// A quadbez builder
     #[serde(rename = "quadbez")]
     QuadBez,
-    /// An cubic bezier builder
+    /// A cubic bezier builder
     #[serde(rename = "cubbez")]
     CubBez,
+    /// A poyline builder
+    #[serde(rename = "polyline")]
+    Polyline,
 }
 
 impl ShapeBuilderType {
@@ -98,6 +103,7 @@ impl ShapeBuilderType {
             "shapebuilder-fociellipse-symbolic" => Some(Self::FociEllipse),
             "shapebuilder-quadbez-symbolic" => Some(Self::QuadBez),
             "shapebuilder-cubbez-symbolic" => Some(Self::CubBez),
+            "shapebuilder-polyline-symbolic" => Some(Self::Polyline),
             _ => None,
         }
     }
@@ -118,6 +124,7 @@ impl ShapeBuilderType {
             Self::FociEllipse => String::from("shapebuilder-fociellipse-symbolic"),
             Self::QuadBez => String::from("shapebuilder-quadbez-symbolic"),
             Self::CubBez => String::from("shapebuilder-cubbez-symbolic"),
+            Self::Polyline => String::from("shapebuilder-polyline-symbolic"),
         }
     }
 }
diff --git a/crates/rnote-compose/src/builders/polylinebuilder.rs b/crates/rnote-compose/src/builders/polylinebuilder.rs
new file mode 100644
index 0000000000..c57ad398b6
--- /dev/null
+++ b/crates/rnote-compose/src/builders/polylinebuilder.rs
@@ -0,0 +1,139 @@
+// Imports
+use super::shapebuildable::{ShapeBuilderCreator, ShapeBuilderProgress};
+use super::ShapeBuildable;
+use crate::constraints::ConstraintRatio;
+use crate::penevents::{KeyboardKey, PenEvent, PenState};
+use crate::penpath::Element;
+use crate::shapes::Polyline;
+use crate::style::{indicators, Composer};
+use crate::Constraints;
+use crate::{Shape, Style};
+use p2d::bounding_volume::{Aabb, BoundingVolume};
+use piet::RenderContext;
+use std::time::Instant;
+
+/// Line builder.
+#[derive(Debug, Clone)]
+pub struct PolylineBuilder {
+    /// Start position.
+    start: na::Vector2<f64>,
+    /// Current position.
+    current: na::Vector2<f64>,
+    /// Path
+    path: Vec<na::Vector2<f64>>,
+    /// Pen state
+    pen_state: PenState,
+    /// Finish the polyline on the next `PenEvent::Up`
+    finish: bool,
+}
+
+impl ShapeBuilderCreator for PolylineBuilder {
+    fn start(element: Element, _now: Instant) -> Self {
+        Self {
+            start: element.pos,
+            current: element.pos,
+            path: Vec::new(),
+            pen_state: PenState::Down,
+            finish: false,
+        }
+    }
+}
+
+impl ShapeBuildable for PolylineBuilder {
+    fn handle_event(
+        &mut self,
+        event: PenEvent,
+        _now: Instant,
+        mut constraints: Constraints,
+    ) -> ShapeBuilderProgress {
+        // we always want to allow horizontal and vertical constraints while building a polyline
+        constraints.ratios.insert(ConstraintRatio::Horizontal);
+        constraints.ratios.insert(ConstraintRatio::Vertical);
+
+        match event {
+            PenEvent::Down { element, .. } => {
+                if self.pen_state == PenState::Up
+                    && (element.pos - self.path.last().copied().unwrap_or(self.start)).magnitude()
+                        < Self::FINISH_TRESHOLD_DIST
+                {
+                    self.finish = true;
+                }
+                self.pen_state = PenState::Down;
+
+                if let Some(last) = self.path.last() {
+                    self.current = constraints.constrain(element.pos - *last) + *last;
+                } else {
+                    self.current = constraints.constrain(element.pos - self.start) + self.start;
+                }
+            }
+            PenEvent::Up { .. } => {
+                if self.finish {
+                    return ShapeBuilderProgress::Finished(vec![Shape::Polyline(
+                        self.state_as_polyline(),
+                    )]);
+                }
+
+                if self.pen_state == PenState::Down {
+                    self.path.push(self.current);
+                }
+                self.pen_state = PenState::Up;
+            }
+            PenEvent::Proximity { .. } => {
+                self.pen_state = PenState::Proximity;
+            }
+            PenEvent::KeyPressed { keyboard_key, .. } => {
+                if keyboard_key == KeyboardKey::Escape {
+                    return ShapeBuilderProgress::Finished(vec![Shape::Polyline(
+                        self.state_as_polyline(),
+                    )]);
+                }
+            }
+            _ => {
+                self.pen_state = PenState::Up;
+            }
+        }
+
+        ShapeBuilderProgress::InProgress
+    }
+
+    fn bounds(&self, style: &Style, zoom: f64) -> Option<Aabb> {
+        let mut polyline = self.state_as_polyline();
+        if !self.finish {
+            polyline.path.push(self.current);
+        }
+        Some(
+            polyline
+                .composed_bounds(style)
+                .loosened(indicators::POS_INDICATOR_RADIUS / zoom),
+        )
+    }
+
+    fn draw_styled(&self, cx: &mut piet_cairo::CairoRenderContext, style: &Style, zoom: f64) {
+        cx.save().unwrap();
+
+        let mut polyline = self.state_as_polyline();
+        if !self.finish {
+            polyline.path.push(self.current);
+        }
+        polyline.draw_composed(cx, style);
+
+        indicators::draw_pos_indicator(cx, PenState::Up, self.start, zoom);
+        if !self.finish {
+            indicators::draw_pos_indicator(cx, PenState::Down, self.current, zoom);
+        }
+
+        cx.restore().unwrap();
+    }
+}
+
+impl PolylineBuilder {
+    const FINISH_TRESHOLD_DIST: f64 = 5.0;
+
+    /// The current state as a polyline.
+    pub fn state_as_polyline(&self) -> Polyline {
+        Polyline {
+            start: self.start,
+            path: self.path.clone(),
+        }
+    }
+}
diff --git a/crates/rnote-compose/src/meson.build b/crates/rnote-compose/src/meson.build
index 9f6d01da60..a0a99745a0 100644
--- a/crates/rnote-compose/src/meson.build
+++ b/crates/rnote-compose/src/meson.build
@@ -13,6 +13,7 @@ rnote_compose_sources = files(
     'builders/penpathcurvedbuilder.rs',
     'builders/penpathmodeledbuilder.rs',
     'builders/penpathsimplebuilder.rs',
+    'builders/polylinebuilder.rs',
     'builders/quadbezbuilder.rs',
     'builders/quadrantcoordsystem2dbuilder.rs',
     'builders/rectanglebuilder.rs',
@@ -25,6 +26,7 @@ rnote_compose_sources = files(
     'shapes/ellipse.rs',
     'shapes/line.rs',
     'shapes/mod.rs',
+    'shapes/polyline.rs',
     'shapes/quadbez.rs',
     'shapes/rectangle.rs',
     'shapes/shape.rs',
diff --git a/crates/rnote-compose/src/penevents.rs b/crates/rnote-compose/src/penevents.rs
index ebb3d623d5..a4e23bd667 100644
--- a/crates/rnote-compose/src/penevents.rs
+++ b/crates/rnote-compose/src/penevents.rs
@@ -163,7 +163,7 @@ pub enum ModifierKey {
 }
 
 /// The current pen state. Used wherever there is internal state.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
 pub enum PenState {
     /// Up.
     Up,
diff --git a/crates/rnote-compose/src/shapes/line.rs b/crates/rnote-compose/src/shapes/line.rs
index 91f59a72b7..231e21bb28 100644
--- a/crates/rnote-compose/src/shapes/line.rs
+++ b/crates/rnote-compose/src/shapes/line.rs
@@ -55,6 +55,11 @@ impl Shapeable for Line {
 }
 
 impl Line {
+    /// A new line.
+    pub fn new(start: na::Vector2<f64>, end: na::Vector2<f64>) -> Self {
+        Self { start, end }
+    }
+
     /// Create a rectangle rotated in the direction of the line, with the given width.
     pub fn line_w_width_to_rect(&self, width: f64) -> Rectangle {
         let vec = self.end - self.start;
diff --git a/crates/rnote-compose/src/shapes/mod.rs b/crates/rnote-compose/src/shapes/mod.rs
index e42afc5bcc..606a03afdd 100644
--- a/crates/rnote-compose/src/shapes/mod.rs
+++ b/crates/rnote-compose/src/shapes/mod.rs
@@ -1,20 +1,29 @@
 // Modules
-mod arrow;
-/// cubic bezier curves
+/// Arrow
+pub mod arrow;
+/// Cubic-bezier curve
 pub mod cubbez;
-mod ellipse;
-mod line;
-/// quadratic bezier curves
+/// Ellipse
+pub mod ellipse;
+/// Line
+pub mod line;
+/// Polyline
+pub mod polyline;
+/// Polyline
 pub mod quadbez;
-mod rectangle;
-mod shape;
-mod shapeable;
+/// Rectangle
+pub mod rectangle;
+/// Shape
+pub mod shape;
+/// Shapeable
+pub mod shapeable;
 
 // Re-exports
 pub use arrow::Arrow;
 pub use cubbez::CubicBezier;
 pub use ellipse::Ellipse;
 pub use line::Line;
+pub use polyline::Polyline;
 pub use quadbez::QuadraticBezier;
 pub use rectangle::Rectangle;
 pub use shape::Shape;
diff --git a/crates/rnote-compose/src/shapes/polyline.rs b/crates/rnote-compose/src/shapes/polyline.rs
new file mode 100644
index 0000000000..8350cd35e7
--- /dev/null
+++ b/crates/rnote-compose/src/shapes/polyline.rs
@@ -0,0 +1,99 @@
+use p2d::bounding_volume::Aabb;
+// Imports
+use serde::{Deserialize, Serialize};
+
+use crate::ext::Vector2Ext;
+use crate::transform::Transformable;
+
+use super::{Line, Shapeable};
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(default, rename = "polyline")]
+/// A Polyline.
+pub struct Polyline {
+    /// The polyline start
+    #[serde(rename = "start")]
+    pub start: na::Vector2<f64>,
+    /// The polyline path
+    #[serde(rename = "path")]
+    pub path: Vec<na::Vector2<f64>>,
+}
+
+impl Transformable for Polyline {
+    fn translate(&mut self, offset: na::Vector2<f64>) {
+        self.start += offset;
+        for p in &mut self.path {
+            *p += offset;
+        }
+    }
+
+    fn rotate(&mut self, angle: f64, center: na::Point2<f64>) {
+        let mut isometry = na::Isometry2::identity();
+        isometry.append_rotation_wrt_point_mut(&na::UnitComplex::new(angle), &center);
+
+        self.start = isometry.transform_point(&self.start.into()).coords;
+        for p in &mut self.path {
+            *p = isometry.transform_point(&(*p).into()).coords;
+        }
+    }
+
+    fn scale(&mut self, scale: na::Vector2<f64>) {
+        self.start = self.start.component_mul(&scale);
+        for p in &mut self.path {
+            *p = p.component_mul(&scale);
+        }
+    }
+}
+
+impl Shapeable for Polyline {
+    fn bounds(&self) -> Aabb {
+        let mut bounds = Aabb::new(self.start.into(), self.start.into());
+        for p in &self.path {
+            bounds.take_point((*p).into());
+        }
+        bounds
+    }
+
+    fn hitboxes(&self) -> Vec<Aabb> {
+        let mut hitboxes = Vec::with_capacity(self.path.len() + 1);
+        hitboxes.push(Aabb::new(self.start.into(), self.start.into()));
+
+        let mut prev = self.start;
+        for p in &self.path {
+            let n_splits = super::hitbox_elems_for_shape_len((p - prev).magnitude());
+            let line = Line::new(prev, *p);
+
+            hitboxes.extend(line.split(n_splits).into_iter().map(|line| line.bounds()));
+
+            prev = *p;
+        }
+
+        hitboxes
+    }
+}
+
+impl Polyline {
+    /// A new polyline
+    pub fn new(start: na::Vector2<f64>) -> Self {
+        Self {
+            start,
+            path: Vec::new(),
+        }
+    }
+
+    /// Convert to [kurbo::BezPath].
+    pub fn to_kurbo(&self) -> kurbo::BezPath {
+        let iter = std::iter::once(kurbo::PathEl::MoveTo(self.start.to_kurbo_point())).chain(
+            self.path
+                .iter()
+                .map(|p| kurbo::PathEl::LineTo(p.to_kurbo_point())),
+        );
+        kurbo::BezPath::from_iter(iter)
+    }
+}
+
+impl Extend<na::Vector2<f64>> for Polyline {
+    fn extend<T: IntoIterator<Item = na::Vector2<f64>>>(&mut self, iter: T) {
+        self.path.extend(iter);
+    }
+}
diff --git a/crates/rnote-compose/src/shapes/shape.rs b/crates/rnote-compose/src/shapes/shape.rs
index 9baab81e3e..25d9d60fd2 100644
--- a/crates/rnote-compose/src/shapes/shape.rs
+++ b/crates/rnote-compose/src/shapes/shape.rs
@@ -1,5 +1,5 @@
 // Imports
-use super::{Arrow, CubicBezier, Ellipse, Line, QuadraticBezier, Rectangle, Shapeable};
+use super::{Arrow, CubicBezier, Ellipse, Line, Polyline, QuadraticBezier, Rectangle, Shapeable};
 use crate::transform::Transformable;
 use p2d::bounding_volume::Aabb;
 use serde::{Deserialize, Serialize};
@@ -26,6 +26,9 @@ pub enum Shape {
     #[serde(rename = "cubbez")]
     /// A cubic bezier curve shape.
     CubicBezier(CubicBezier),
+    #[serde(rename = "polyline")]
+    /// A polyline shape.
+    Polyline(Polyline),
 }
 
 impl Default for Shape {
@@ -55,6 +58,9 @@ impl Transformable for Shape {
             Self::CubicBezier(cubbez) => {
                 cubbez.translate(offset);
             }
+            Self::Polyline(polyline) => {
+                polyline.translate(offset);
+            }
         }
     }
 
@@ -78,6 +84,9 @@ impl Transformable for Shape {
             Self::CubicBezier(cubbez) => {
                 cubbez.rotate(angle, center);
             }
+            Self::Polyline(polyline) => {
+                polyline.rotate(angle, center);
+            }
         }
     }
 
@@ -101,6 +110,9 @@ impl Transformable for Shape {
             Self::CubicBezier(cubbez) => {
                 cubbez.scale(scale);
             }
+            Self::Polyline(polyline) => {
+                polyline.scale(scale);
+            }
         }
     }
 }
@@ -114,6 +126,7 @@ impl Shapeable for Shape {
             Self::Ellipse(ellipse) => ellipse.bounds(),
             Self::QuadraticBezier(quadbez) => quadbez.bounds(),
             Self::CubicBezier(cubbez) => cubbez.bounds(),
+            Self::Polyline(polyline) => polyline.bounds(),
         }
     }
     fn hitboxes(&self) -> Vec<Aabb> {
@@ -124,6 +137,7 @@ impl Shapeable for Shape {
             Self::Ellipse(ellipse) => ellipse.hitboxes(),
             Self::QuadraticBezier(quadbez) => quadbez.hitboxes(),
             Self::CubicBezier(cubbez) => cubbez.hitboxes(),
+            Self::Polyline(polyline) => polyline.hitboxes(),
         }
     }
 }
diff --git a/crates/rnote-compose/src/style/mod.rs b/crates/rnote-compose/src/style/mod.rs
index 59f1b7ba2c..e58d029e9f 100644
--- a/crates/rnote-compose/src/style/mod.rs
+++ b/crates/rnote-compose/src/style/mod.rs
@@ -16,7 +16,7 @@ use self::smooth::SmoothOptions;
 use self::textured::TexturedOptions;
 
 // Imports
-use crate::shapes::{Arrow, CubicBezier, Ellipse, Line, QuadraticBezier, Rectangle};
+use crate::shapes::{Arrow, CubicBezier, Ellipse, Line, Polyline, QuadraticBezier, Rectangle};
 use crate::{Color, PenPath, Shape};
 use anyhow::Context;
 pub use composer::Composer;
@@ -198,6 +198,24 @@ impl Composer<Style> for CubicBezier {
     }
 }
 
+impl Composer<Style> for Polyline {
+    fn composed_bounds(&self, options: &Style) -> p2d::bounding_volume::Aabb {
+        match options {
+            Style::Smooth(options) => self.composed_bounds(options),
+            Style::Rough(options) => self.composed_bounds(options),
+            Style::Textured(_options) => unimplemented!(),
+        }
+    }
+
+    fn draw_composed(&self, cx: &mut impl piet::RenderContext, options: &Style) {
+        match options {
+            Style::Smooth(options) => self.draw_composed(cx, options),
+            Style::Rough(options) => self.draw_composed(cx, options),
+            Style::Textured(_options) => unimplemented!(),
+        }
+    }
+}
+
 impl Composer<Style> for PenPath {
     fn composed_bounds(&self, options: &Style) -> p2d::bounding_volume::Aabb {
         match options {
@@ -225,6 +243,7 @@ impl Composer<Style> for Shape {
             Shape::Ellipse(ellipse) => ellipse.composed_bounds(options),
             Shape::QuadraticBezier(quadratic_bezier) => quadratic_bezier.composed_bounds(options),
             Shape::CubicBezier(cubic_bezier) => cubic_bezier.composed_bounds(options),
+            Shape::Polyline(polyline) => polyline.composed_bounds(options),
         }
     }
 
@@ -236,6 +255,7 @@ impl Composer<Style> for Shape {
             Shape::Ellipse(ellipse) => ellipse.draw_composed(cx, options),
             Shape::QuadraticBezier(quadratic_bezier) => quadratic_bezier.draw_composed(cx, options),
             Shape::CubicBezier(cubic_bezier) => cubic_bezier.draw_composed(cx, options),
+            Shape::Polyline(polyline) => polyline.draw_composed(cx, options),
         }
     }
 }
diff --git a/crates/rnote-compose/src/style/rough/mod.rs b/crates/rnote-compose/src/style/rough/mod.rs
index c9333affc9..ac9bdbc9bf 100644
--- a/crates/rnote-compose/src/style/rough/mod.rs
+++ b/crates/rnote-compose/src/style/rough/mod.rs
@@ -8,9 +8,9 @@ pub use roughoptions::RoughOptions;
 // Imports
 use super::Composer;
 use crate::ext::Vector2Ext;
-use crate::shapes::Arrow;
 use crate::shapes::Line;
 use crate::shapes::Rectangle;
+use crate::shapes::{Arrow, Polyline};
 use crate::shapes::{CubicBezier, Shapeable};
 use crate::shapes::{Ellipse, QuadraticBezier};
 use crate::Color;
@@ -203,6 +203,31 @@ impl Composer<RoughOptions> for CubicBezier {
     }
 }
 
+impl Composer<RoughOptions> for Polyline {
+    fn composed_bounds(&self, options: &RoughOptions) -> Aabb {
+        self.bounds()
+            .loosened(options.stroke_width * 0.5 + RoughOptions::ROUGH_BOUNDS_MARGIN)
+    }
+
+    fn draw_composed(&self, cx: &mut impl piet::RenderContext, options: &RoughOptions) {
+        let points: Vec<roughr::Point2D<_, _>> = std::iter::once(roughr::Point2D::new(
+            self.start[0] as f32,
+            self.start[1] as f32,
+        ))
+        .chain(
+            self.path
+                .iter()
+                .map(|p| roughr::Point2D::new(p[0] as f32, p[1] as f32)),
+        )
+        .collect();
+
+        let drawable = rough_piet::KurboGenerator::new(generate_roughr_options(options))
+            .linear_path(&points, false);
+
+        drawable.draw(cx);
+    }
+}
+
 impl Composer<RoughOptions> for crate::Shape {
     fn composed_bounds(&self, options: &RoughOptions) -> Aabb {
         match self {
@@ -212,6 +237,7 @@ impl Composer<RoughOptions> for crate::Shape {
             crate::Shape::Ellipse(ellipse) => ellipse.composed_bounds(options),
             crate::Shape::QuadraticBezier(quadbez) => quadbez.composed_bounds(options),
             crate::Shape::CubicBezier(cubbez) => cubbez.composed_bounds(options),
+            crate::Shape::Polyline(polyline) => polyline.composed_bounds(options),
         }
     }
 
@@ -223,6 +249,7 @@ impl Composer<RoughOptions> for crate::Shape {
             crate::Shape::Ellipse(ellipse) => ellipse.draw_composed(cx, options),
             crate::Shape::QuadraticBezier(quadbez) => quadbez.draw_composed(cx, options),
             crate::Shape::CubicBezier(cubbez) => cubbez.draw_composed(cx, options),
+            crate::Shape::Polyline(polyline) => polyline.draw_composed(cx, options),
         }
     }
 }
diff --git a/crates/rnote-compose/src/style/smooth/mod.rs b/crates/rnote-compose/src/style/smooth/mod.rs
index 4a3cef5e24..9252c70095 100644
--- a/crates/rnote-compose/src/style/smooth/mod.rs
+++ b/crates/rnote-compose/src/style/smooth/mod.rs
@@ -8,12 +8,12 @@ pub use smoothoptions::SmoothOptions;
 use super::Composer;
 use crate::ext::Vector2Ext;
 use crate::penpath::{self, Segment};
-use crate::shapes::Ellipse;
 use crate::shapes::Line;
 use crate::shapes::QuadraticBezier;
 use crate::shapes::Rectangle;
 use crate::shapes::Shapeable;
 use crate::shapes::{Arrow, CubicBezier};
+use crate::shapes::{Ellipse, Polyline};
 use crate::PenPath;
 use kurbo::Shape;
 use p2d::bounding_volume::{Aabb, BoundingVolume};
@@ -144,6 +144,37 @@ impl Composer<SmoothOptions> for CubicBezier {
     }
 }
 
+impl Composer<SmoothOptions> for Polyline {
+    fn composed_bounds(&self, options: &SmoothOptions) -> Aabb {
+        self.bounds().loosened(options.stroke_width * 0.5)
+    }
+
+    fn draw_composed(&self, cx: &mut impl piet::RenderContext, options: &SmoothOptions) {
+        let Some(color) = options.stroke_color else {
+            return;
+        };
+        let n_points = self.path.len();
+        let single_pos = self.path.iter().all(|p| *p == self.start);
+
+        // Single element/position polylines need special treatment to be rendered
+        if n_points == 0 || single_pos {
+            cx.fill(
+                kurbo::Circle::new(self.start.to_kurbo_point(), options.stroke_width),
+                &Into::<piet::Color>::into(color),
+            );
+        } else {
+            cx.stroke_styled(
+                self.to_kurbo(),
+                &Into::<piet::Color>::into(color),
+                options.stroke_width,
+                &piet::StrokeStyle::default()
+                    .line_cap(piet::LineCap::Butt)
+                    .line_join(piet::LineJoin::Bevel),
+            );
+        }
+    }
+}
+
 impl Composer<SmoothOptions> for PenPath {
     fn composed_bounds(&self, options: &SmoothOptions) -> Aabb {
         self.bounds().loosened(options.stroke_width * 0.5)
@@ -278,6 +309,7 @@ impl Composer<SmoothOptions> for crate::Shape {
             crate::Shape::Ellipse(ellipse) => ellipse.composed_bounds(options),
             crate::Shape::QuadraticBezier(quadbez) => quadbez.composed_bounds(options),
             crate::Shape::CubicBezier(cubbez) => cubbez.composed_bounds(options),
+            crate::Shape::Polyline(polyline) => polyline.composed_bounds(options),
         }
     }
 
@@ -289,6 +321,7 @@ impl Composer<SmoothOptions> for crate::Shape {
             crate::Shape::Ellipse(ellipse) => ellipse.draw_composed(cx, options),
             crate::Shape::QuadraticBezier(quadbez) => quadbez.draw_composed(cx, options),
             crate::Shape::CubicBezier(cubbez) => cubbez.draw_composed(cx, options),
+            crate::Shape::Polyline(polyline) => polyline.draw_composed(cx, options),
         }
     }
 }
diff --git a/crates/rnote-engine/src/pens/shaper.rs b/crates/rnote-engine/src/pens/shaper.rs
index 3fc8572c40..3af2bce998 100644
--- a/crates/rnote-engine/src/pens/shaper.rs
+++ b/crates/rnote-engine/src/pens/shaper.rs
@@ -7,7 +7,7 @@ use crate::strokes::Stroke;
 use crate::{DrawableOnDoc, WidgetFlags};
 use p2d::bounding_volume::Aabb;
 use piet::RenderContext;
-use rnote_compose::builders::{ArrowBuilder, GridBuilder};
+use rnote_compose::builders::{ArrowBuilder, GridBuilder, PolylineBuilder};
 use rnote_compose::builders::{
     CoordSystem2DBuilder, CoordSystem3DBuilder, EllipseBuilder, FociEllipseBuilder, LineBuilder,
     QuadrantCoordSystem2DBuilder, RectangleBuilder, ShapeBuildable,
@@ -243,5 +243,6 @@ fn new_builder(
         ShapeBuilderType::FociEllipse => Box::new(FociEllipseBuilder::start(element, now)),
         ShapeBuilderType::QuadBez => Box::new(QuadBezBuilder::start(element, now)),
         ShapeBuilderType::CubBez => Box::new(CubBezBuilder::start(element, now)),
+        ShapeBuilderType::Polyline => Box::new(PolylineBuilder::start(element, now)),
     }
 }
diff --git a/crates/rnote-ui/data/icons/scalable/actions/shapebuilder-polyline-symbolic.svg b/crates/rnote-ui/data/icons/scalable/actions/shapebuilder-polyline-symbolic.svg
new file mode 100644
index 0000000000..3f64b4ab35
--- /dev/null
+++ b/crates/rnote-ui/data/icons/scalable/actions/shapebuilder-polyline-symbolic.svg
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   height="16px"
+   viewBox="0 0 16 16"
+   width="16px"
+   version="1.1"
+   id="svg169"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+     id="defs173"><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath2873"><circle
+         style="display:none;fill:none;stroke:#444444;stroke-width:0.0430271;stroke-dasharray:none;stroke-opacity:1"
+         id="circle2875"
+         cx="0.52916664"
+         cy="3.4395833"
+         r="0.11384288"
+         d="M 0.64300952,3.4395833 A 0.11384288,0.11384288 0 0 1 0.52916664,3.5534262 0.11384288,0.11384288 0 0 1 0.41532376,3.4395833 0.11384288,0.11384288 0 0 1 0.52916664,3.3257404 0.11384288,0.11384288 0 0 1 0.64300952,3.4395833 Z" /><path
+         id="lpe_path-effect2877"
+         style="fill:none;stroke:#444444;stroke-width:0.0430271;stroke-dasharray:none;stroke-opacity:1"
+         class="powerclip"
+         d="M -4.4708333,-3.9659488 H 6.7812597 V 8.4895833 H -4.4708333 Z M 1.4367595,1.0583333 A 0.11384288,0.11384288 0 0 0 1.3229166,0.9444904 0.11384288,0.11384288 0 0 0 1.2090737,1.0583333 0.11384288,0.11384288 0 0 0 1.3229166,1.1721762 0.11384288,0.11384288 0 0 0 1.4367595,1.0583333 Z" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath2945" /><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath2989"><path
+         id="lpe_path-effect2993"
+         style="fill:none;stroke:#444444;stroke-width:0.0430271;stroke-dasharray:none;stroke-opacity:1"
+         class="powerclip"
+         d="M -4.4707031,-3.9667969 H 6.7813388 V 8.4902344 H -4.4707031 Z M 0.64300952,3.4395833 A 0.11384288,0.11384288 0 0 0 0.52916664,3.3257404 0.11384288,0.11384288 0 0 0 0.41532376,3.4395833 0.11384288,0.11384288 0 0 0 0.52916664,3.5534262 0.11384288,0.11384288 0 0 0 0.64300952,3.4395833 Z" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3029"><path
+         id="lpe_path-effect3033"
+         style="fill:none;stroke:#444444;stroke-width:0.0430271;stroke-dasharray:none;stroke-opacity:1"
+         class="powerclip"
+         d="M -4.4707031,-3.9667969 H 6.7813388 V 8.4902344 H -4.4707031 Z M 1.4367595,1.0583333 A 0.11384288,0.11384288 0 0 0 1.3229166,0.9444904 0.11384288,0.11384288 0 0 0 1.2090737,1.0583333 0.11384288,0.11384288 0 0 0 1.3229166,1.1721762 0.11384288,0.11384288 0 0 0 1.4367595,1.0583333 Z" /></clipPath><clipPath
+       clipPathUnits="userSpaceOnUse"
+       id="clipPath3176-6"><path
+         id="lpe_path-effect3180-2"
+         style="fill:none;stroke:#444444;stroke-width:0.0430271;stroke-dasharray:none;stroke-opacity:1"
+         class="powerclip"
+         d="M -4.4707031,-3.9667969 H 6.7813388 V 8.4902344 H -4.4707031 Z m 5.11384286,7.40625 A 0.11384288,0.11384288 0 0 0 0.52929687,3.3256102 0.11384288,0.11384288 0 0 0 0.41545399,3.4394531 0.11384288,0.11384288 0 0 0 0.52929687,3.553296 0.11384288,0.11384288 0 0 0 0.64313976,3.4394531 Z" /></clipPath></defs><filter
+     id="a"
+     height="1"
+     width="1"
+     x="0"
+     y="0"><feColorMatrix
+       in="SourceGraphic"
+       type="matrix"
+       values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"
+       id="feColorMatrix2" /></filter><mask
+     id="b"><g
+       filter="url(#a)"
+       id="g7"><path
+         d="m 0 0 h 16 v 16 h -16 z"
+         fill-opacity="0.3"
+         id="path5" /></g></mask><clipPath
+     id="c"><path
+       d="m 0 0 h 1024 v 800 h -1024 z"
+       id="path10" /></clipPath><mask
+     id="d"><g
+       filter="url(#a)"
+       id="g15"><path
+         d="m 0 0 h 16 v 16 h -16 z"
+         fill-opacity="0.05"
+         id="path13" /></g></mask><clipPath
+     id="e"><path
+       d="m 0 0 h 1024 v 800 h -1024 z"
+       id="path18" /></clipPath><mask
+     id="f"><g
+       filter="url(#a)"
+       id="g23"><path
+         d="m 0 0 h 16 v 16 h -16 z"
+         fill-opacity="0.05"
+         id="path21" /></g></mask><clipPath
+     id="g"><path
+       d="m 0 0 h 1024 v 800 h -1024 z"
+       id="path26" /></clipPath><mask
+     id="h"><g
+       filter="url(#a)"
+       id="g31"><path
+         d="m 0 0 h 16 v 16 h -16 z"
+         fill-opacity="0.05"
+         id="path29" /></g></mask><clipPath
+     id="i"><path
+       d="m 0 0 h 1024 v 800 h -1024 z"
+       id="path34" /></clipPath><mask
+     id="j"><g
+       filter="url(#a)"
+       id="g39"><path
+         d="m 0 0 h 16 v 16 h -16 z"
+         fill-opacity="0.05"
+         id="path37" /></g></mask><clipPath
+     id="k"><path
+       d="m 0 0 h 1024 v 800 h -1024 z"
+       id="path42" /></clipPath><mask
+     id="l"><g
+       filter="url(#a)"
+       id="g47"><path
+         d="m 0 0 h 16 v 16 h -16 z"
+         fill-opacity="0.05"
+         id="path45" /></g></mask><clipPath
+     id="m"><path
+       d="m 0 0 h 1024 v 800 h -1024 z"
+       id="path50" /></clipPath><mask
+     id="n"><g
+       filter="url(#a)"
+       id="g55"><path
+         d="m 0 0 h 16 v 16 h -16 z"
+         fill-opacity="0.05"
+         id="path53" /></g></mask><clipPath
+     id="o"><path
+       d="m 0 0 h 1024 v 800 h -1024 z"
+       id="path58" /></clipPath><mask
+     id="p"><g
+       filter="url(#a)"
+       id="g63"><path
+         d="m 0 0 h 16 v 16 h -16 z"
+         fill-opacity="0.3"
+         id="path61" /></g></mask><clipPath
+     id="q"><path
+       d="m 0 0 h 1024 v 800 h -1024 z"
+       id="path66" /></clipPath><mask
+     id="r"><g
+       filter="url(#a)"
+       id="g71"><path
+         d="m 0 0 h 16 v 16 h -16 z"
+         fill-opacity="0.5"
+         id="path69" /></g></mask><clipPath
+     id="s"><path
+       d="m 0 0 h 1024 v 800 h -1024 z"
+       id="path74" /></clipPath><mask
+     id="t"><g
+       filter="url(#a)"
+       id="g79"><path
+         d="m 0 0 h 16 v 16 h -16 z"
+         fill-opacity="0.4"
+         id="path77" /></g></mask><clipPath
+     id="u"><path
+       d="m 0 0 h 1024 v 800 h -1024 z"
+       id="path82" /></clipPath><mask
+     id="v"><g
+       filter="url(#a)"
+       id="g87"><path
+         d="m 0 0 h 16 v 16 h -16 z"
+         fill-opacity="0.4"
+         id="path85" /></g></mask><clipPath
+     id="w"><path
+       d="m 0 0 h 1024 v 800 h -1024 z"
+       id="path90" /></clipPath><mask
+     id="x"><g
+       filter="url(#a)"
+       id="g95"><path
+         d="m 0 0 h 16 v 16 h -16 z"
+         fill-opacity="0.5"
+         id="path93" /></g></mask><clipPath
+     id="y"><path
+       d="m 0 0 h 1024 v 800 h -1024 z"
+       id="path98" /></clipPath><mask
+     id="z"><g
+       filter="url(#a)"
+       id="g103"><path
+         d="m 0 0 h 16 v 16 h -16 z"
+         fill-opacity="0.5"
+         id="path101" /></g></mask><clipPath
+     id="A"><path
+       d="m 0 0 h 1024 v 800 h -1024 z"
+       id="path106" /></clipPath><g
+     clip-path="url(#c)"
+     mask="url(#b)"
+     transform="matrix(1 0 0 1 -16 -700)"
+     id="g111"><path
+       d="m 562.460938 212.058594 h 10.449218 c -1.183594 0.492187 -1.296875 2.460937 0 3 h -10.449218 z m 0 0"
+       fill="#2e3436"
+       id="path109" /></g><g
+     clip-path="url(#e)"
+     mask="url(#d)"
+     transform="matrix(1 0 0 1 -16 -700)"
+     id="g115"><path
+       d="m 16 632 h 1 v 1 h -1 z m 0 0"
+       fill="#2e3436"
+       fill-rule="evenodd"
+       id="path113" /></g><g
+     clip-path="url(#g)"
+     mask="url(#f)"
+     transform="matrix(1 0 0 1 -16 -700)"
+     id="g119"><path
+       d="m 17 631 h 1 v 1 h -1 z m 0 0"
+       fill="#2e3436"
+       fill-rule="evenodd"
+       id="path117" /></g><g
+     clip-path="url(#i)"
+     mask="url(#h)"
+     transform="matrix(1 0 0 1 -16 -700)"
+     id="g123"><path
+       d="m 18 634 h 1 v 1 h -1 z m 0 0"
+       fill="#2e3436"
+       fill-rule="evenodd"
+       id="path121" /></g><g
+     clip-path="url(#k)"
+     mask="url(#j)"
+     transform="matrix(1 0 0 1 -16 -700)"
+     id="g127"><path
+       d="m 16 634 h 1 v 1 h -1 z m 0 0"
+       fill="#2e3436"
+       fill-rule="evenodd"
+       id="path125" /></g><g
+     clip-path="url(#m)"
+     mask="url(#l)"
+     transform="matrix(1 0 0 1 -16 -700)"
+     id="g131"><path
+       d="m 17 635 h 1 v 1 h -1 z m 0 0"
+       fill="#2e3436"
+       fill-rule="evenodd"
+       id="path129" /></g><g
+     clip-path="url(#o)"
+     mask="url(#n)"
+     transform="matrix(1 0 0 1 -16 -700)"
+     id="g135"><path
+       d="m 19 635 h 1 v 1 h -1 z m 0 0"
+       fill="#2e3436"
+       fill-rule="evenodd"
+       id="path133" /></g><g
+     clip-path="url(#q)"
+     mask="url(#p)"
+     transform="matrix(1 0 0 1 -16 -700)"
+     id="g139"><path
+       d="m 136 660 v 7 h 7 v -7 z m 0 0"
+       fill="#2e3436"
+       id="path137" /></g><g
+     clip-path="url(#s)"
+     mask="url(#r)"
+     transform="matrix(1 0 0 1 -16 -700)"
+     id="g143"><path
+       d="m 199 642 h 3 v 12 h -3 z m 0 0"
+       fill="#2e3436"
+       id="path141" /></g><g
+     clip-path="url(#u)"
+     mask="url(#t)"
+     transform="matrix(1 0 0 1 -16 -700)"
+     id="g155"><path
+       d="m 209.5 144.160156 c 0.277344 0 0.5 0.222656 0.5 0.5 v 1 c 0 0.277344 -0.222656 0.5 -0.5 0.5 s -0.5 -0.222656 -0.5 -0.5 v -1 c 0 -0.277344 0.222656 -0.5 0.5 -0.5 z m 0 0"
+       fill="#2e3436"
+       id="path153" /></g><g
+     clip-path="url(#w)"
+     mask="url(#v)"
+     transform="matrix(1 0 0 1 -16 -700)"
+     id="g159"><path
+       d="m 206.5 144.160156 c 0.277344 0 0.5 0.222656 0.5 0.5 v 1 c 0 0.277344 -0.222656 0.5 -0.5 0.5 s -0.5 -0.222656 -0.5 -0.5 v -1 c 0 -0.277344 0.222656 -0.5 0.5 -0.5 z m 0 0"
+       fill="#2e3436"
+       id="path157" /></g><g
+     clip-path="url(#y)"
+     mask="url(#x)"
+     transform="matrix(1 0 0 1 -16 -700)"
+     id="g163"><path
+       d="m 229.5 143.160156 c -0.546875 0 -1 0.457032 -1 1 c 0 0.546875 0.453125 1 1 1 s 1 -0.453125 1 -1 c 0 -0.542968 -0.453125 -1 -1 -1 z m 0 0"
+       fill="#2e3436"
+       id="path161" /></g><g
+     clip-path="url(#A)"
+     mask="url(#z)"
+     transform="matrix(1 0 0 1 -16 -700)"
+     id="g167"><path
+       d="m 226.453125 143.160156 c -0.519531 0 -0.953125 0.433594 -0.953125 0.953125 v 0.09375 c 0 0.519531 0.433594 0.953125 0.953125 0.953125 h 0.09375 c 0.519531 0 0.953125 -0.433594 0.953125 -0.953125 v -0.09375 c 0 -0.519531 -0.433594 -0.953125 -0.953125 -0.953125 z m 0 0"
+       fill="#2e3436"
+       id="path165" /></g><path
+     style="color:#000000;fill:#2e3436;fill-opacity:1;stroke-width:3.77953"
+     d="m 4.9670826,12.901105 c -0.54995,0 -0.996555,0.446605 -0.996555,0.996555 0,0.54995 0.446605,1.003937 0.996555,1.003937 0.54995,0 1.003937,-0.453987 1.003937,-1.003937 0,-0.54995 -0.453987,-0.996555 -1.003937,-0.996555 z m 0,0.39124 c 0.3369,0 0.605315,0.268419 0.605315,0.605315 0,0.3369 -0.268418,0.605315 -0.605315,0.605315 -0.336899,0 -0.605314,-0.268418 -0.605314,-0.605315 0,-0.336899 0.268418,-0.605315 0.605314,-0.605315 z"
+     id="path1138-6-3" /><path
+     style="color:#000000;fill:#2e3436;fill-opacity:1;stroke-width:3.77953"
+     d="m 13.477577,1.7102433 c -0.54995,0 -0.996555,0.446605 -0.996555,0.996555 0,0.54995 0.446605,1.003937 0.996555,1.003937 0.54995,0 1.003937,-0.453987 1.003937,-1.003937 0,-0.54995 -0.453987,-0.996555 -1.003937,-0.996555 z m 0,0.39124 c 0.3369,0 0.605315,0.268419 0.605315,0.605315 0,0.3369 -0.268418,0.605315 -0.605315,0.605315 -0.336899,0 -0.605314,-0.268418 -0.605314,-0.605315 0,-0.336899 0.268418,-0.605315 0.605314,-0.605315 z"
+     id="path1138-6-3-0" /><path
+     style="color:#000000;fill:#2e3436;stroke-linejoin:round;-inkscape-stroke:none"
+     d="M 12.744141,3.3535156 10.927734,9.3339844 3.5351563,5.1582031 A 0.50005,0.50005 0 0 0 2.7988281,5.6914062 L 4.3554687,13.402344 5.3359375,13.205078 3.9960938,6.5664062 10.978516,10.511719 a 0.50005,0.50005 0 0 0 0.724609,-0.291016 l 1.996094,-6.5781249 z"
+     id="path1" /></svg>
diff --git a/crates/rnote-ui/data/resources.gresource.xml.in b/crates/rnote-ui/data/resources.gresource.xml.in
index acc170dfd9..d895ed3e62 100644
--- a/crates/rnote-ui/data/resources.gresource.xml.in
+++ b/crates/rnote-ui/data/resources.gresource.xml.in
@@ -130,17 +130,18 @@
         <file compressed="true">icons/scalable/actions/text-align-fill-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/text-align-start-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/text-align-end-symbolic.svg</file>
-        <file compressed="true">icons/scalable/actions/shapebuilder-line-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/shapebuilder-arrow-symbolic.svg</file>
-        <file compressed="true">icons/scalable/actions/shapebuilder-rectangle-symbolic.svg</file>
-        <file compressed="true">icons/scalable/actions/shapebuilder-grid-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/shapebuilder-coordsystem2d-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/shapebuilder-coordsystem3d-symbolic.svg</file>
-        <file compressed="true">icons/scalable/actions/shapebuilder-quadrantcoordsystem2d-symbolic.svg</file>
+        <file compressed="true">icons/scalable/actions/shapebuilder-cubbez-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/shapebuilder-ellipse-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/shapebuilder-fociellipse-symbolic.svg</file>
+        <file compressed="true">icons/scalable/actions/shapebuilder-grid-symbolic.svg</file>
+        <file compressed="true">icons/scalable/actions/shapebuilder-line-symbolic.svg</file>
+        <file compressed="true">icons/scalable/actions/shapebuilder-polyline-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/shapebuilder-quadbez-symbolic.svg</file>
-        <file compressed="true">icons/scalable/actions/shapebuilder-cubbez-symbolic.svg</file>
+        <file compressed="true">icons/scalable/actions/shapebuilder-quadrantcoordsystem2d-symbolic.svg</file>
+        <file compressed="true">icons/scalable/actions/shapebuilder-rectangle-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/stylus-button-primary-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/stylus-button-secondary-symbolic.svg</file>
         <file compressed="true">icons/scalable/actions/stylus-button-eraser-symbolic.svg</file>
diff --git a/crates/rnote-ui/src/penssidebar/shaperpage.rs b/crates/rnote-ui/src/penssidebar/shaperpage.rs
index 8beb2b5fa9..9305f30f67 100644
--- a/crates/rnote-ui/src/penssidebar/shaperpage.rs
+++ b/crates/rnote-ui/src/penssidebar/shaperpage.rs
@@ -373,6 +373,7 @@ fn shape_builder_type_icons_get_groups() -> Vec<GroupedIconPickerGroupData> {
             icons: StringList::new(&[
                 "shapebuilder-quadbez-symbolic",
                 "shapebuilder-cubbez-symbolic",
+                "shapebuilder-polyline-symbolic",
             ]),
         },
     ]
@@ -393,5 +394,6 @@ fn shape_builder_type_icons_to_display_name(icon_name: &str) -> String {
         ShapeBuilderType::FociEllipse => gettext("Ellipse with foci"),
         ShapeBuilderType::QuadBez => gettext("Quadratic bezier curve"),
         ShapeBuilderType::CubBez => gettext("Cubic bezier curve"),
+        ShapeBuilderType::Polyline => gettext("Polyline"),
     }
 }

From 7f23aac8c5c0061d778f151b03a47b5831fce618 Mon Sep 17 00:00:00 2001
From: Felix Zwettler <f.zwettler@posteo.de>
Date: Tue, 15 Aug 2023 18:21:17 +0200
Subject: [PATCH 02/10] improve selection highlights for shapes

---
 crates/rnote-compose/src/penpath/mod.rs       | 29 ++++++-----
 crates/rnote-compose/src/shapes/arrow.rs      | 49 ++++++++-----------
 crates/rnote-compose/src/shapes/cubbez.rs     | 24 ++++-----
 crates/rnote-compose/src/shapes/ellipse.rs    | 36 +++++++-------
 crates/rnote-compose/src/shapes/line.rs       | 10 ++--
 crates/rnote-compose/src/shapes/polyline.rs   | 19 ++++---
 crates/rnote-compose/src/shapes/quadbez.rs    | 22 ++++-----
 crates/rnote-compose/src/shapes/rectangle.rs  | 39 +++++++--------
 crates/rnote-compose/src/shapes/shape.rs      | 13 +++++
 crates/rnote-compose/src/shapes/shapeable.rs  |  2 +
 crates/rnote-compose/src/style/smooth/mod.rs  | 31 ++++++------
 .../rnote-engine/src/strokes/bitmapimage.rs   | 20 ++------
 .../rnote-engine/src/strokes/brushstroke.rs   |  6 ++-
 crates/rnote-engine/src/strokes/content.rs    | 22 ++++++++-
 .../rnote-engine/src/strokes/shapestroke.rs   | 29 ++++++++---
 crates/rnote-engine/src/strokes/stroke.rs     | 10 ++++
 crates/rnote-engine/src/strokes/textstroke.rs | 20 ++------
 .../rnote-engine/src/strokes/vectorimage.rs   | 21 +++-----
 18 files changed, 219 insertions(+), 183 deletions(-)

diff --git a/crates/rnote-compose/src/penpath/mod.rs b/crates/rnote-compose/src/penpath/mod.rs
index 84716f599b..3177170463 100644
--- a/crates/rnote-compose/src/penpath/mod.rs
+++ b/crates/rnote-compose/src/penpath/mod.rs
@@ -45,7 +45,12 @@ impl Shapeable for PenPath {
                         end: end.pos,
                     };
 
-                    bounds.merge(&quadbez.to_kurbo().bounding_box().bounds_to_p2d_aabb());
+                    bounds.merge(
+                        &quadbez
+                            .to_kurbo_bezpath()
+                            .bounding_box()
+                            .bounds_to_p2d_aabb(),
+                    );
                     prev = *end;
                 }
                 Segment::CubBezTo { cp1, cp2, end } => {
@@ -56,7 +61,12 @@ impl Shapeable for PenPath {
                         end: end.pos,
                     };
 
-                    bounds.merge(&cubbez.to_kurbo().bounding_box().bounds_to_p2d_aabb());
+                    bounds.merge(
+                        &cubbez
+                            .to_kurbo_bezpath()
+                            .bounding_box()
+                            .bounds_to_p2d_aabb(),
+                    );
                     prev = *end;
                 }
             }
@@ -71,6 +81,10 @@ impl Shapeable for PenPath {
             .flat_map(|(_, hb)| hb)
             .collect()
     }
+
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+        kurbo::BezPath::from_iter(self.to_kurbo_el_iter())
+    }
 }
 
 impl Transformable for PenPath {
@@ -183,7 +197,7 @@ impl PenPath {
                     };
 
                     let n_splits =
-                        no_subsegments_for_segment_len(quadbez.to_kurbo().perimeter(0.25));
+                        no_subsegments_for_segment_len(quadbez.to_kurbo_bezpath().perimeter(0.25));
 
                     hitboxes.push((
                         i,
@@ -204,7 +218,7 @@ impl PenPath {
                     };
 
                     let n_splits =
-                        no_subsegments_for_segment_len(cubbez.to_kurbo().perimeter(0.25));
+                        no_subsegments_for_segment_len(cubbez.to_kurbo_bezpath().perimeter(0.25));
 
                     hitboxes.push((
                         i,
@@ -222,13 +236,6 @@ impl PenPath {
         hitboxes
     }
 
-    /// Convert to [kurbo::BezPath].
-    pub fn to_kurbo(&self) -> kurbo::BezPath {
-        let elements = self.to_kurbo_el_iter();
-
-        kurbo::BezPath::from_iter(elements)
-    }
-
     /// Convert to [kurbo::BezPath], flattened to the given precision.
     pub fn to_kurbo_flattened(&self, tolerance: f64) -> kurbo::BezPath {
         let elements = self.to_kurbo_el_iter();
diff --git a/crates/rnote-compose/src/shapes/arrow.rs b/crates/rnote-compose/src/shapes/arrow.rs
index e9a107fb3b..ef1d4edf00 100644
--- a/crates/rnote-compose/src/shapes/arrow.rs
+++ b/crates/rnote-compose/src/shapes/arrow.rs
@@ -3,7 +3,7 @@ use super::Line;
 use crate::ext::Vector2Ext;
 use crate::shapes::Shapeable;
 use crate::transform::Transformable;
-use kurbo::PathEl;
+use kurbo::{PathEl, Shape};
 use na::Rotation2;
 use p2d::bounding_volume::Aabb;
 use serde::{Deserialize, Serialize};
@@ -71,6 +71,10 @@ impl Shapeable for Arrow {
             .map(|line| line.bounds())
             .collect()
     }
+
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+        self.to_kurbo(None)
+    }
 }
 
 impl Arrow {
@@ -109,25 +113,21 @@ impl Arrow {
             .collect::<Vec<Line>>()
     }
 
-    /// Convert to kurbo shapes.
-    pub fn to_kurbo(&self, stroke_width: Option<f64>) -> ArrowKurbo {
-        let main = kurbo::Line::new(self.start.to_kurbo_point(), self.tip.to_kurbo_point());
-        let tip_triangle = {
-            let tip = self.tip.to_kurbo_point();
-            let lline = self.compute_lline(stroke_width).to_kurbo_point();
-            let rline = self.compute_rline(stroke_width).to_kurbo_point();
-
-            kurbo::BezPath::from_vec(vec![
-                PathEl::MoveTo(lline),
-                PathEl::LineTo(tip),
-                PathEl::LineTo(rline),
-            ])
-        };
-
-        ArrowKurbo {
-            stem: main,
-            tip_triangle,
-        }
+    /// Convert to kurbo shape.
+    pub fn to_kurbo(&self, stroke_width: Option<f64>) -> kurbo::BezPath {
+        let mut bez_path =
+            kurbo::Line::new(self.start.to_kurbo_point(), self.tip.to_kurbo_point()).to_path(0.25);
+        let tip = self.tip.to_kurbo_point();
+        let lline = self.compute_lline(stroke_width).to_kurbo_point();
+        let rline = self.compute_rline(stroke_width).to_kurbo_point();
+
+        bez_path.extend([
+            PathEl::MoveTo(lline),
+            PathEl::LineTo(tip),
+            PathEl::LineTo(rline),
+        ]);
+
+        bez_path
     }
 
     /// Compute the `lline` of the arrow tip.
@@ -186,12 +186,3 @@ impl Arrow {
         Self::TIP_LINES_DEFAULT_LENGTH * (1.0 + 0.18 * factor)
     }
 }
-
-/// A helper struct which holds the kurbo-elements of the arrow.
-#[derive(Debug, Clone, PartialEq)]
-pub struct ArrowKurbo {
-    /// The line from `start` -> `tip`.
-    pub stem: kurbo::Line,
-    /// The line from `lline` -> `tip` -> `rline`.
-    pub tip_triangle: kurbo::BezPath,
-}
diff --git a/crates/rnote-compose/src/shapes/cubbez.rs b/crates/rnote-compose/src/shapes/cubbez.rs
index be718c3224..e2729d0b32 100644
--- a/crates/rnote-compose/src/shapes/cubbez.rs
+++ b/crates/rnote-compose/src/shapes/cubbez.rs
@@ -54,17 +54,27 @@ impl Transformable for CubicBezier {
 
 impl Shapeable for CubicBezier {
     fn bounds(&self) -> p2d::bounding_volume::Aabb {
-        self.to_kurbo().bounding_box().bounds_to_p2d_aabb()
+        self.to_kurbo_bezpath().bounding_box().bounds_to_p2d_aabb()
     }
 
     fn hitboxes(&self) -> Vec<Aabb> {
-        let n_splits = super::hitbox_elems_for_shape_len(self.to_kurbo().perimeter(0.25));
+        let n_splits = super::hitbox_elems_for_shape_len(self.to_kurbo_bezpath().perimeter(0.25));
 
         self.approx_with_lines(n_splits)
             .into_iter()
             .map(|line| line.bounds())
             .collect()
     }
+
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+        kurbo::CubicBez::new(
+            self.start.to_kurbo_point(),
+            self.cp1.to_kurbo_point(),
+            self.cp2.to_kurbo_point(),
+            self.end.to_kurbo_point(),
+        )
+        .to_path(0.25)
+    }
 }
 
 impl CubicBezier {
@@ -157,16 +167,6 @@ impl CubicBezier {
 
         lines
     }
-
-    /// Convert to kurbo shape.
-    pub fn to_kurbo(&self) -> kurbo::CubicBez {
-        kurbo::CubicBez::new(
-            self.start.to_kurbo_point(),
-            self.cp1.to_kurbo_point(),
-            self.cp2.to_kurbo_point(),
-            self.end.to_kurbo_point(),
-        )
-    }
 }
 
 /// Calculate a point on a cubic curve given t ranging [0.0, 1.0].
diff --git a/crates/rnote-compose/src/shapes/ellipse.rs b/crates/rnote-compose/src/shapes/ellipse.rs
index 6ed5283ccb..f56b3dc248 100644
--- a/crates/rnote-compose/src/shapes/ellipse.rs
+++ b/crates/rnote-compose/src/shapes/ellipse.rs
@@ -62,6 +62,12 @@ impl Shapeable for Ellipse {
             .map(|line| line.bounds())
             .collect()
     }
+
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+        (self.transform.affine.to_kurbo()
+            * kurbo::Ellipse::new(kurbo::Point::ZERO, self.radii.to_kurbo_vec(), 0.0))
+        .to_path(0.25)
+    }
 }
 
 impl Ellipse {
@@ -92,24 +98,20 @@ impl Ellipse {
         let mut lines = Vec::new();
         let mut prev = kurbo::Point::new(0.0, 0.0);
 
-        self.to_kurbo().to_path(0.1).flatten(0.1, |el| match el {
-            kurbo::PathEl::MoveTo(point) => prev = point,
-            kurbo::PathEl::LineTo(next) => {
-                lines.push(Line {
-                    start: na::vector![prev.x, prev.y],
-                    end: na::vector![next.x, next.y],
-                });
-                prev = next
-            }
-            _ => {}
-        });
+        self.to_kurbo_bezpath()
+            .to_path(0.1)
+            .flatten(0.1, |el| match el {
+                kurbo::PathEl::MoveTo(point) => prev = point,
+                kurbo::PathEl::LineTo(next) => {
+                    lines.push(Line {
+                        start: na::vector![prev.x, prev.y],
+                        end: na::vector![next.x, next.y],
+                    });
+                    prev = next
+                }
+                _ => {}
+            });
 
         lines
     }
-
-    /// Convert to kurbo shape.
-    pub fn to_kurbo(&self) -> kurbo::Ellipse {
-        self.transform.affine.to_kurbo()
-            * kurbo::Ellipse::new(kurbo::Point::ZERO, self.radii.to_kurbo_vec(), 0.0)
-    }
 }
diff --git a/crates/rnote-compose/src/shapes/line.rs b/crates/rnote-compose/src/shapes/line.rs
index 231e21bb28..053f3d31f2 100644
--- a/crates/rnote-compose/src/shapes/line.rs
+++ b/crates/rnote-compose/src/shapes/line.rs
@@ -4,6 +4,7 @@ use crate::shapes::Rectangle;
 use crate::shapes::Shapeable;
 use crate::transform::Transformable;
 use crate::Transform;
+use kurbo::Shape;
 use p2d::bounding_volume::Aabb;
 use serde::{Deserialize, Serialize};
 
@@ -52,6 +53,10 @@ impl Shapeable for Line {
             .map(|line| line.bounds())
             .collect()
     }
+
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+        kurbo::Line::new(self.start.to_kurbo_point(), self.end.to_kurbo_point()).to_path(0.25)
+    }
 }
 
 impl Line {
@@ -90,9 +95,4 @@ impl Line {
             })
             .collect::<Vec<Self>>()
     }
-
-    /// Convert to kurbo shape.
-    pub fn to_kurbo(&self) -> kurbo::Line {
-        kurbo::Line::new(self.start.to_kurbo_point(), self.end.to_kurbo_point())
-    }
 }
diff --git a/crates/rnote-compose/src/shapes/polyline.rs b/crates/rnote-compose/src/shapes/polyline.rs
index 8350cd35e7..20e1563a60 100644
--- a/crates/rnote-compose/src/shapes/polyline.rs
+++ b/crates/rnote-compose/src/shapes/polyline.rs
@@ -70,6 +70,15 @@ impl Shapeable for Polyline {
 
         hitboxes
     }
+
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+        let iter = std::iter::once(kurbo::PathEl::MoveTo(self.start.to_kurbo_point())).chain(
+            self.path
+                .iter()
+                .map(|p| kurbo::PathEl::LineTo(p.to_kurbo_point())),
+        );
+        kurbo::BezPath::from_iter(iter)
+    }
 }
 
 impl Polyline {
@@ -80,16 +89,6 @@ impl Polyline {
             path: Vec::new(),
         }
     }
-
-    /// Convert to [kurbo::BezPath].
-    pub fn to_kurbo(&self) -> kurbo::BezPath {
-        let iter = std::iter::once(kurbo::PathEl::MoveTo(self.start.to_kurbo_point())).chain(
-            self.path
-                .iter()
-                .map(|p| kurbo::PathEl::LineTo(p.to_kurbo_point())),
-        );
-        kurbo::BezPath::from_iter(iter)
-    }
 }
 
 impl Extend<na::Vector2<f64>> for Polyline {
diff --git a/crates/rnote-compose/src/shapes/quadbez.rs b/crates/rnote-compose/src/shapes/quadbez.rs
index 0c9fae88b6..7af2784b6d 100644
--- a/crates/rnote-compose/src/shapes/quadbez.rs
+++ b/crates/rnote-compose/src/shapes/quadbez.rs
@@ -48,17 +48,26 @@ impl Transformable for QuadraticBezier {
 
 impl Shapeable for QuadraticBezier {
     fn bounds(&self) -> p2d::bounding_volume::Aabb {
-        self.to_kurbo().bounding_box().bounds_to_p2d_aabb()
+        self.to_kurbo_bezpath().bounding_box().bounds_to_p2d_aabb()
     }
 
     fn hitboxes(&self) -> Vec<Aabb> {
-        let n_splits = super::hitbox_elems_for_shape_len(self.to_kurbo().perimeter(0.25));
+        let n_splits = super::hitbox_elems_for_shape_len(self.to_kurbo_bezpath().perimeter(0.25));
 
         self.approx_with_lines(n_splits)
             .into_iter()
             .map(|line| line.bounds())
             .collect()
     }
+
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+        kurbo::QuadBez::new(
+            self.start.to_kurbo_point(),
+            self.cp.to_kurbo_point(),
+            self.end.to_kurbo_point(),
+        )
+        .to_path(0.25)
+    }
 }
 
 impl QuadraticBezier {
@@ -109,15 +118,6 @@ impl QuadraticBezier {
 
         lines
     }
-
-    /// Convert to kurbo shape.
-    pub fn to_kurbo(&self) -> kurbo::QuadBez {
-        kurbo::QuadBez::new(
-            self.start.to_kurbo_point(),
-            self.cp.to_kurbo_point(),
-            self.end.to_kurbo_point(),
-        )
-    }
 }
 
 /// Coefficient a of quadratic bezier in polynomial form: C = a * t^2 + b * t + c
diff --git a/crates/rnote-compose/src/shapes/rectangle.rs b/crates/rnote-compose/src/shapes/rectangle.rs
index 67084bf0bc..7c8375a489 100644
--- a/crates/rnote-compose/src/shapes/rectangle.rs
+++ b/crates/rnote-compose/src/shapes/rectangle.rs
@@ -48,6 +48,25 @@ impl Shapeable for Rectangle {
             .flat_map(|line| line.hitboxes())
             .collect()
     }
+
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+        let tl = self.transform.affine
+            * na::point![-self.cuboid.half_extents[0], -self.cuboid.half_extents[1]];
+        let tr = self.transform.affine
+            * na::point![self.cuboid.half_extents[0], -self.cuboid.half_extents[1]];
+        let bl = self.transform.affine
+            * na::point![-self.cuboid.half_extents[0], self.cuboid.half_extents[1]];
+        let br = self.transform.affine
+            * na::point![self.cuboid.half_extents[0], self.cuboid.half_extents[1]];
+
+        kurbo::BezPath::from_vec(vec![
+            kurbo::PathEl::MoveTo(tl.coords.to_kurbo_point()),
+            kurbo::PathEl::LineTo(tr.coords.to_kurbo_point()),
+            kurbo::PathEl::LineTo(br.coords.to_kurbo_point()),
+            kurbo::PathEl::LineTo(bl.coords.to_kurbo_point()),
+            kurbo::PathEl::ClosePath,
+        ])
+    }
 }
 
 impl Transformable for Rectangle {
@@ -131,24 +150,4 @@ impl Rectangle {
             },
         ]
     }
-
-    /// Convert to kurbo shape.
-    pub fn to_kurbo(&self) -> kurbo::BezPath {
-        let tl = self.transform.affine
-            * na::point![-self.cuboid.half_extents[0], -self.cuboid.half_extents[1]];
-        let tr = self.transform.affine
-            * na::point![self.cuboid.half_extents[0], -self.cuboid.half_extents[1]];
-        let bl = self.transform.affine
-            * na::point![-self.cuboid.half_extents[0], self.cuboid.half_extents[1]];
-        let br = self.transform.affine
-            * na::point![self.cuboid.half_extents[0], self.cuboid.half_extents[1]];
-
-        kurbo::BezPath::from_vec(vec![
-            kurbo::PathEl::MoveTo(tl.coords.to_kurbo_point()),
-            kurbo::PathEl::LineTo(tr.coords.to_kurbo_point()),
-            kurbo::PathEl::LineTo(br.coords.to_kurbo_point()),
-            kurbo::PathEl::LineTo(bl.coords.to_kurbo_point()),
-            kurbo::PathEl::ClosePath,
-        ])
-    }
 }
diff --git a/crates/rnote-compose/src/shapes/shape.rs b/crates/rnote-compose/src/shapes/shape.rs
index 25d9d60fd2..46be0dbe94 100644
--- a/crates/rnote-compose/src/shapes/shape.rs
+++ b/crates/rnote-compose/src/shapes/shape.rs
@@ -129,6 +129,7 @@ impl Shapeable for Shape {
             Self::Polyline(polyline) => polyline.bounds(),
         }
     }
+
     fn hitboxes(&self) -> Vec<Aabb> {
         match self {
             Self::Arrow(arrow) => arrow.hitboxes(),
@@ -140,4 +141,16 @@ impl Shapeable for Shape {
             Self::Polyline(polyline) => polyline.hitboxes(),
         }
     }
+
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+        match self {
+            Self::Arrow(arrow) => arrow.to_kurbo_bezpath(),
+            Self::Line(line) => line.to_kurbo_bezpath(),
+            Self::Rectangle(rectangle) => rectangle.to_kurbo_bezpath(),
+            Self::Ellipse(ellipse) => ellipse.to_kurbo_bezpath(),
+            Self::QuadraticBezier(quadbez) => quadbez.to_kurbo_bezpath(),
+            Self::CubicBezier(cubbez) => cubbez.to_kurbo_bezpath(),
+            Self::Polyline(polyline) => polyline.to_kurbo_bezpath(),
+        }
+    }
 }
diff --git a/crates/rnote-compose/src/shapes/shapeable.rs b/crates/rnote-compose/src/shapes/shapeable.rs
index 017a8459dd..bcedcf3f50 100644
--- a/crates/rnote-compose/src/shapes/shapeable.rs
+++ b/crates/rnote-compose/src/shapes/shapeable.rs
@@ -17,4 +17,6 @@ pub trait Shapeable: Transformable {
         self.translate(-self.pos());
         self.translate(pos)
     }
+    /// Convert its outline, or if applicable itself to a [kurbo::BezPath].
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath;
 }
diff --git a/crates/rnote-compose/src/style/smooth/mod.rs b/crates/rnote-compose/src/style/smooth/mod.rs
index 9252c70095..40feff04af 100644
--- a/crates/rnote-compose/src/style/smooth/mod.rs
+++ b/crates/rnote-compose/src/style/smooth/mod.rs
@@ -25,7 +25,7 @@ impl Composer<SmoothOptions> for Line {
 
     fn draw_composed(&self, cx: &mut impl piet::RenderContext, options: &SmoothOptions) {
         cx.save().unwrap();
-        let line = self.to_kurbo();
+        let line = self.to_kurbo_bezpath();
 
         if let Some(stroke_color) = options.stroke_color {
             let stroke_brush = cx.solid_brush(stroke_color.into());
@@ -45,11 +45,12 @@ impl Composer<SmoothOptions> for Arrow {
         cx.save().unwrap();
 
         if let Some(stroke_color) = options.stroke_color {
-            let stroke_brush = cx.solid_brush(stroke_color.into());
             let arrow = self.to_kurbo(Some(options.stroke_width));
-
-            cx.stroke(arrow.stem, &stroke_brush, options.stroke_width);
-            cx.stroke(arrow.tip_triangle, &stroke_brush, options.stroke_width);
+            cx.stroke(
+                arrow,
+                &Into::<piet::Color>::into(stroke_color),
+                options.stroke_width,
+            );
         }
 
         cx.restore().unwrap();
@@ -63,7 +64,7 @@ impl Composer<SmoothOptions> for Rectangle {
 
     fn draw_composed(&self, cx: &mut impl piet::RenderContext, options: &SmoothOptions) {
         cx.save().unwrap();
-        let shape = self.to_kurbo();
+        let shape = self.to_kurbo_bezpath();
 
         if let Some(fill_color) = options.fill_color {
             let fill_brush = cx.solid_brush(fill_color.into());
@@ -85,11 +86,11 @@ impl Composer<SmoothOptions> for Ellipse {
 
     fn draw_composed(&self, cx: &mut impl piet::RenderContext, options: &SmoothOptions) {
         cx.save().unwrap();
-        let ellipse = self.to_kurbo();
+        let ellipse = self.to_kurbo_bezpath();
 
         if let Some(fill_color) = options.fill_color {
             let fill_brush = cx.solid_brush(fill_color.into());
-            cx.fill(ellipse, &fill_brush);
+            cx.fill(&ellipse, &fill_brush);
         }
 
         if let Some(stroke_color) = options.stroke_color {
@@ -107,11 +108,11 @@ impl Composer<SmoothOptions> for QuadraticBezier {
 
     fn draw_composed(&self, cx: &mut impl piet::RenderContext, options: &SmoothOptions) {
         cx.save().unwrap();
-        let quadbez = self.to_kurbo();
+        let quadbez = self.to_kurbo_bezpath();
 
         if let Some(fill_color) = options.fill_color {
             let fill_brush = cx.solid_brush(fill_color.into());
-            cx.fill(quadbez, &fill_brush);
+            cx.fill(&quadbez, &fill_brush);
         }
 
         if let Some(stroke_color) = options.stroke_color {
@@ -129,11 +130,11 @@ impl Composer<SmoothOptions> for CubicBezier {
 
     fn draw_composed(&self, cx: &mut impl piet::RenderContext, options: &SmoothOptions) {
         cx.save().unwrap();
-        let cubbez = self.to_kurbo();
+        let cubbez = self.to_kurbo_bezpath();
 
         if let Some(fill_color) = options.fill_color {
             let fill_brush = cx.solid_brush(fill_color.into());
-            cx.fill(cubbez, &fill_brush);
+            cx.fill(&cubbez, &fill_brush);
         }
 
         if let Some(stroke_color) = options.stroke_color {
@@ -164,7 +165,7 @@ impl Composer<SmoothOptions> for Polyline {
             );
         } else {
             cx.stroke_styled(
-                self.to_kurbo(),
+                self.to_kurbo_bezpath(),
                 &Into::<piet::Color>::into(color),
                 options.stroke_width,
                 &piet::StrokeStyle::default()
@@ -238,7 +239,7 @@ impl Composer<SmoothOptions> for PenPath {
                             end: end.pos,
                         };
                         let n_splits = penpath::no_subsegments_for_segment_len(
-                            quadbez.to_kurbo().perimeter(0.25),
+                            quadbez.to_kurbo_bezpath().perimeter(0.25),
                         )
                         .max(2);
                         let lines = quadbez.approx_with_lines(n_splits);
@@ -265,7 +266,7 @@ impl Composer<SmoothOptions> for PenPath {
                             end: end.pos,
                         };
                         let n_splits = penpath::no_subsegments_for_segment_len(
-                            cubbez.to_kurbo().perimeter(0.25),
+                            cubbez.to_kurbo_bezpath().perimeter(0.25),
                         )
                         .max(2);
                         let lines = cubbez.approx_with_lines(n_splits);
diff --git a/crates/rnote-engine/src/strokes/bitmapimage.rs b/crates/rnote-engine/src/strokes/bitmapimage.rs
index d07834e1ac..03b6b6175d 100644
--- a/crates/rnote-engine/src/strokes/bitmapimage.rs
+++ b/crates/rnote-engine/src/strokes/bitmapimage.rs
@@ -1,11 +1,11 @@
 // Imports
-use super::content::{self};
 use super::{Content, Stroke};
 use crate::document::Format;
 use crate::engine::import::{PdfImportPageSpacing, PdfImportPrefs};
 use crate::render;
 use crate::Drawable;
 use anyhow::Context;
+use kurbo::Shape;
 use p2d::bounding_volume::Aabb;
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use rnote_compose::color;
@@ -40,20 +40,6 @@ impl Default for BitmapImage {
 }
 
 impl Content for BitmapImage {
-    fn draw_highlight(
-        &self,
-        cx: &mut impl piet::RenderContext,
-        total_zoom: f64,
-    ) -> anyhow::Result<()> {
-        const HIGHLIGHT_STROKE_WIDTH: f64 = 1.5;
-        cx.stroke(
-            self.bounds().to_kurbo_rect(),
-            &content::CONTENT_HIGHLIGHT_COLOR,
-            HIGHLIGHT_STROKE_WIDTH / total_zoom,
-        );
-        Ok(())
-    }
-
     fn update_geometry(&mut self) {}
 }
 
@@ -88,6 +74,10 @@ impl Shapeable for BitmapImage {
     fn hitboxes(&self) -> Vec<Aabb> {
         vec![self.bounds()]
     }
+
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+        self.bounds().to_kurbo_rect().to_path(0.25)
+    }
 }
 
 impl Transformable for BitmapImage {
diff --git a/crates/rnote-engine/src/strokes/brushstroke.rs b/crates/rnote-engine/src/strokes/brushstroke.rs
index 9e19c789b1..916ead98cd 100644
--- a/crates/rnote-engine/src/strokes/brushstroke.rs
+++ b/crates/rnote-engine/src/strokes/brushstroke.rs
@@ -184,7 +184,7 @@ impl Content for BrushStroke {
             cx.fill(bounds.to_kurbo_rect(), &content::CONTENT_HIGHLIGHT_COLOR);
         } else {
             cx.stroke_styled(
-                self.path.to_kurbo(),
+                self.to_kurbo_bezpath(),
                 &content::CONTENT_HIGHLIGHT_COLOR,
                 (HIGHLIGHT_STROKE_WIDTH / total_zoom)
                     .max(self.style.stroke_width() + 2.0 / total_zoom),
@@ -231,6 +231,10 @@ impl Shapeable for BrushStroke {
     fn hitboxes(&self) -> Vec<Aabb> {
         self.hitboxes.clone()
     }
+
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+        self.path.to_kurbo_bezpath()
+    }
 }
 
 impl Transformable for BrushStroke {
diff --git a/crates/rnote-engine/src/strokes/content.rs b/crates/rnote-engine/src/strokes/content.rs
index c78eca4ab6..470ded8a6f 100644
--- a/crates/rnote-engine/src/strokes/content.rs
+++ b/crates/rnote-engine/src/strokes/content.rs
@@ -1,6 +1,7 @@
 // Imports
 use crate::{render, Drawable};
 use p2d::bounding_volume::{Aabb, BoundingVolume};
+use rnote_compose::ext::AabbExt;
 use rnote_compose::{color, shapes::Shapeable};
 
 #[derive(Debug, Clone)]
@@ -77,7 +78,26 @@ where
         &self,
         cx: &mut impl piet::RenderContext,
         total_zoom: f64,
-    ) -> anyhow::Result<()>;
+    ) -> anyhow::Result<()> {
+        const HIGHLIGHT_STROKE_WIDTH: f64 = 1.5;
+        const DRAW_BOUNDS_THRESHOLD_AREA: f64 = 10_u32.pow(2) as f64;
+        let bounds = self.bounds();
+        let bez_path = self.to_kurbo_bezpath();
+
+        if bounds.scale(total_zoom).volume() < DRAW_BOUNDS_THRESHOLD_AREA {
+            cx.fill(bounds.to_kurbo_rect(), &CONTENT_HIGHLIGHT_COLOR);
+        } else {
+            cx.stroke_styled(
+                bez_path,
+                &CONTENT_HIGHLIGHT_COLOR,
+                HIGHLIGHT_STROKE_WIDTH / total_zoom,
+                &piet::StrokeStyle::new()
+                    .line_join(piet::LineJoin::Round)
+                    .line_cap(piet::LineCap::Round),
+            );
+        }
+        Ok(())
+    }
 
     /// Update the content geometry, possibly regenerating internally stored state.
     ///
diff --git a/crates/rnote-engine/src/strokes/shapestroke.rs b/crates/rnote-engine/src/strokes/shapestroke.rs
index 278cf632bc..547e17af80 100644
--- a/crates/rnote-engine/src/strokes/shapestroke.rs
+++ b/crates/rnote-engine/src/strokes/shapestroke.rs
@@ -28,12 +28,25 @@ impl Content for ShapeStroke {
         cx: &mut impl piet::RenderContext,
         total_zoom: f64,
     ) -> anyhow::Result<()> {
-        const HIGHLIGHT_STROKE_WIDTH: f64 = 1.5;
-        cx.stroke(
-            self.bounds().to_kurbo_rect(),
-            &content::CONTENT_HIGHLIGHT_COLOR,
-            HIGHLIGHT_STROKE_WIDTH / total_zoom,
-        );
+        const PATH_HIGHLIGHT_MIN_STROKE_WIDTH: f64 = 5.0;
+        const DRAW_BOUNDS_THRESHOLD_AREA: f64 = 10_u32.pow(2) as f64;
+        let bounds = self.bounds();
+        let bez_path = self.shape.to_kurbo_bezpath();
+
+        if bounds.scale(total_zoom).volume() < DRAW_BOUNDS_THRESHOLD_AREA {
+            cx.fill(bounds.to_kurbo_rect(), &content::CONTENT_HIGHLIGHT_COLOR);
+        } else {
+            cx.stroke_styled(
+                bez_path,
+                &content::CONTENT_HIGHLIGHT_COLOR,
+                (PATH_HIGHLIGHT_MIN_STROKE_WIDTH / total_zoom)
+                    .max(self.style.stroke_width() + 10.0 / total_zoom),
+                &piet::StrokeStyle::new()
+                    .line_join(piet::LineJoin::Round)
+                    .line_cap(piet::LineCap::Round),
+            );
+        }
+
         Ok(())
     }
 
@@ -65,6 +78,10 @@ impl Shapeable for ShapeStroke {
     fn hitboxes(&self) -> Vec<Aabb> {
         self.hitboxes.clone()
     }
+
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+        self.shape.to_kurbo_bezpath()
+    }
 }
 
 impl Transformable for ShapeStroke {
diff --git a/crates/rnote-engine/src/strokes/stroke.rs b/crates/rnote-engine/src/strokes/stroke.rs
index c9d7a126e6..25f755e169 100644
--- a/crates/rnote-engine/src/strokes/stroke.rs
+++ b/crates/rnote-engine/src/strokes/stroke.rs
@@ -127,6 +127,16 @@ impl Shapeable for Stroke {
             Self::BitmapImage(bitmapimage) => bitmapimage.hitboxes(),
         }
     }
+
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+        match self {
+            Self::BrushStroke(brushstroke) => brushstroke.to_kurbo_bezpath(),
+            Self::ShapeStroke(shapestroke) => shapestroke.to_kurbo_bezpath(),
+            Self::TextStroke(textstroke) => textstroke.to_kurbo_bezpath(),
+            Self::VectorImage(vectorimage) => vectorimage.to_kurbo_bezpath(),
+            Self::BitmapImage(bitmapimage) => bitmapimage.to_kurbo_bezpath(),
+        }
+    }
 }
 
 impl Transformable for Stroke {
diff --git a/crates/rnote-engine/src/strokes/textstroke.rs b/crates/rnote-engine/src/strokes/textstroke.rs
index c0ae6bd47b..eb9ab66ac6 100644
--- a/crates/rnote-engine/src/strokes/textstroke.rs
+++ b/crates/rnote-engine/src/strokes/textstroke.rs
@@ -1,6 +1,6 @@
 // Imports
 use super::Content;
-use crate::{strokes::content, Camera, Drawable};
+use crate::{Camera, Drawable};
 use kurbo::Shape;
 use p2d::bounding_volume::Aabb;
 use piet::{RenderContext, TextLayout, TextLayoutBuilder};
@@ -479,23 +479,13 @@ impl Shapeable for TextStroke {
 
         hitboxes
     }
-}
 
-impl Content for TextStroke {
-    fn draw_highlight(
-        &self,
-        cx: &mut impl piet::RenderContext,
-        total_zoom: f64,
-    ) -> anyhow::Result<()> {
-        const HIGHLIGHT_STROKE_WIDTH: f64 = 1.5;
-        cx.stroke(
-            self.bounds().to_kurbo_rect(),
-            &content::CONTENT_HIGHLIGHT_COLOR,
-            HIGHLIGHT_STROKE_WIDTH / total_zoom,
-        );
-        Ok(())
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+        self.bounds().to_kurbo_rect().to_path(0.25)
     }
+}
 
+impl Content for TextStroke {
     fn update_geometry(&mut self) {}
 }
 
diff --git a/crates/rnote-engine/src/strokes/vectorimage.rs b/crates/rnote-engine/src/strokes/vectorimage.rs
index 0150ffd5ba..68fc9ee1ea 100644
--- a/crates/rnote-engine/src/strokes/vectorimage.rs
+++ b/crates/rnote-engine/src/strokes/vectorimage.rs
@@ -1,9 +1,10 @@
 // Imports
 use super::content::GeneratedContentImages;
 use super::{Content, Stroke};
+use crate::document::Format;
 use crate::engine::import::{PdfImportPageSpacing, PdfImportPrefs};
-use crate::{document::Format, strokes::content};
 use crate::{render, Drawable};
+use kurbo::Shape;
 use p2d::bounding_volume::Aabb;
 use rayon::iter::{IntoParallelIterator, ParallelIterator};
 use rnote_compose::color;
@@ -86,20 +87,6 @@ impl Content for VectorImage {
         ]))
     }
 
-    fn draw_highlight(
-        &self,
-        cx: &mut impl piet::RenderContext,
-        total_zoom: f64,
-    ) -> anyhow::Result<()> {
-        const HIGHLIGHT_STROKE_WIDTH: f64 = 1.5;
-        cx.stroke(
-            self.bounds().to_kurbo_rect(),
-            &content::CONTENT_HIGHLIGHT_COLOR,
-            HIGHLIGHT_STROKE_WIDTH / total_zoom,
-        );
-        Ok(())
-    }
-
     fn update_geometry(&mut self) {}
 }
 
@@ -127,6 +114,10 @@ impl Shapeable for VectorImage {
     fn hitboxes(&self) -> Vec<Aabb> {
         vec![self.bounds()]
     }
+
+    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+        self.bounds().to_kurbo_rect().to_path(0.25)
+    }
 }
 
 impl Transformable for VectorImage {

From 8a6c56cf07909bbdf8342b87ca9b72735c4a1eac Mon Sep 17 00:00:00 2001
From: Felix Zwettler <f.zwettler@posteo.de>
Date: Tue, 15 Aug 2023 18:27:01 +0200
Subject: [PATCH 03/10] const name

---
 crates/rnote-engine/src/strokes/brushstroke.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/rnote-engine/src/strokes/brushstroke.rs b/crates/rnote-engine/src/strokes/brushstroke.rs
index 916ead98cd..b4646c9443 100644
--- a/crates/rnote-engine/src/strokes/brushstroke.rs
+++ b/crates/rnote-engine/src/strokes/brushstroke.rs
@@ -175,7 +175,7 @@ impl Content for BrushStroke {
         cx: &mut impl piet::RenderContext,
         total_zoom: f64,
     ) -> anyhow::Result<()> {
-        const HIGHLIGHT_STROKE_WIDTH: f64 = 5.0;
+        const PATH_HIGHLIGHT_MIN_STROKE_WIDTH: f64 = 5.0;
         const DRAW_BOUNDS_THRESHOLD_AREA: f64 = 10_u32.pow(2) as f64;
 
         let bounds = self.bounds();
@@ -186,8 +186,8 @@ impl Content for BrushStroke {
             cx.stroke_styled(
                 self.to_kurbo_bezpath(),
                 &content::CONTENT_HIGHLIGHT_COLOR,
-                (HIGHLIGHT_STROKE_WIDTH / total_zoom)
-                    .max(self.style.stroke_width() + 2.0 / total_zoom),
+                (PATH_HIGHLIGHT_MIN_STROKE_WIDTH / total_zoom)
+                    .max(self.style.stroke_width() + 3.0 / total_zoom),
                 &piet::StrokeStyle::new()
                     .line_join(piet::LineJoin::Round)
                     .line_cap(piet::LineCap::Round),

From 55d9158d39e07990fedbd6011903840da1a00ffe Mon Sep 17 00:00:00 2001
From: Felix Zwettler <f.zwettler@posteo.de>
Date: Tue, 15 Aug 2023 18:34:46 +0200
Subject: [PATCH 04/10] fix polyline builder with stylus

---
 crates/rnote-compose/src/builders/polylinebuilder.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/rnote-compose/src/builders/polylinebuilder.rs b/crates/rnote-compose/src/builders/polylinebuilder.rs
index c57ad398b6..9e500b2769 100644
--- a/crates/rnote-compose/src/builders/polylinebuilder.rs
+++ b/crates/rnote-compose/src/builders/polylinebuilder.rs
@@ -52,7 +52,7 @@ impl ShapeBuildable for PolylineBuilder {
 
         match event {
             PenEvent::Down { element, .. } => {
-                if self.pen_state == PenState::Up
+                if (self.pen_state == PenState::Up || self.pen_state == PenState::Proximity)
                     && (element.pos - self.path.last().copied().unwrap_or(self.start)).magnitude()
                         < Self::FINISH_TRESHOLD_DIST
                 {
@@ -127,7 +127,7 @@ impl ShapeBuildable for PolylineBuilder {
 }
 
 impl PolylineBuilder {
-    const FINISH_TRESHOLD_DIST: f64 = 5.0;
+    const FINISH_TRESHOLD_DIST: f64 = 8.0;
 
     /// The current state as a polyline.
     pub fn state_as_polyline(&self) -> Polyline {

From 564a6774869ac4df2d697341f757c1c06132051a Mon Sep 17 00:00:00 2001
From: Felix Zwettler <f.zwettler@posteo.de>
Date: Tue, 15 Aug 2023 23:06:34 +0200
Subject: [PATCH 05/10] rename outline path method

---
 crates/rnote-compose/src/penpath/mod.rs       | 20 +++++--------------
 crates/rnote-compose/src/shapes/arrow.rs      |  2 +-
 crates/rnote-compose/src/shapes/cubbez.rs     |  6 +++---
 crates/rnote-compose/src/shapes/ellipse.rs    |  4 ++--
 crates/rnote-compose/src/shapes/line.rs       |  2 +-
 crates/rnote-compose/src/shapes/polyline.rs   |  2 +-
 crates/rnote-compose/src/shapes/quadbez.rs    |  6 +++---
 crates/rnote-compose/src/shapes/rectangle.rs  |  2 +-
 crates/rnote-compose/src/shapes/shape.rs      | 16 +++++++--------
 crates/rnote-compose/src/shapes/shapeable.rs  |  8 ++++----
 crates/rnote-compose/src/style/smooth/mod.rs  | 16 +++++++--------
 .../rnote-engine/src/strokes/bitmapimage.rs   |  2 +-
 .../rnote-engine/src/strokes/brushstroke.rs   |  6 +++---
 crates/rnote-engine/src/strokes/content.rs    |  2 +-
 .../rnote-engine/src/strokes/shapestroke.rs   |  6 +++---
 crates/rnote-engine/src/strokes/stroke.rs     | 12 +++++------
 crates/rnote-engine/src/strokes/textstroke.rs |  2 +-
 .../rnote-engine/src/strokes/vectorimage.rs   |  2 +-
 18 files changed, 53 insertions(+), 63 deletions(-)

diff --git a/crates/rnote-compose/src/penpath/mod.rs b/crates/rnote-compose/src/penpath/mod.rs
index 3177170463..00571254e6 100644
--- a/crates/rnote-compose/src/penpath/mod.rs
+++ b/crates/rnote-compose/src/penpath/mod.rs
@@ -45,12 +45,7 @@ impl Shapeable for PenPath {
                         end: end.pos,
                     };
 
-                    bounds.merge(
-                        &quadbez
-                            .to_kurbo_bezpath()
-                            .bounding_box()
-                            .bounds_to_p2d_aabb(),
-                    );
+                    bounds.merge(&quadbez.outline_path().bounding_box().bounds_to_p2d_aabb());
                     prev = *end;
                 }
                 Segment::CubBezTo { cp1, cp2, end } => {
@@ -61,12 +56,7 @@ impl Shapeable for PenPath {
                         end: end.pos,
                     };
 
-                    bounds.merge(
-                        &cubbez
-                            .to_kurbo_bezpath()
-                            .bounding_box()
-                            .bounds_to_p2d_aabb(),
-                    );
+                    bounds.merge(&cubbez.outline_path().bounding_box().bounds_to_p2d_aabb());
                     prev = *end;
                 }
             }
@@ -82,7 +72,7 @@ impl Shapeable for PenPath {
             .collect()
     }
 
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+    fn outline_path(&self) -> kurbo::BezPath {
         kurbo::BezPath::from_iter(self.to_kurbo_el_iter())
     }
 }
@@ -197,7 +187,7 @@ impl PenPath {
                     };
 
                     let n_splits =
-                        no_subsegments_for_segment_len(quadbez.to_kurbo_bezpath().perimeter(0.25));
+                        no_subsegments_for_segment_len(quadbez.outline_path().perimeter(0.25));
 
                     hitboxes.push((
                         i,
@@ -218,7 +208,7 @@ impl PenPath {
                     };
 
                     let n_splits =
-                        no_subsegments_for_segment_len(cubbez.to_kurbo_bezpath().perimeter(0.25));
+                        no_subsegments_for_segment_len(cubbez.outline_path().perimeter(0.25));
 
                     hitboxes.push((
                         i,
diff --git a/crates/rnote-compose/src/shapes/arrow.rs b/crates/rnote-compose/src/shapes/arrow.rs
index ef1d4edf00..66a567866d 100644
--- a/crates/rnote-compose/src/shapes/arrow.rs
+++ b/crates/rnote-compose/src/shapes/arrow.rs
@@ -72,7 +72,7 @@ impl Shapeable for Arrow {
             .collect()
     }
 
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+    fn outline_path(&self) -> kurbo::BezPath {
         self.to_kurbo(None)
     }
 }
diff --git a/crates/rnote-compose/src/shapes/cubbez.rs b/crates/rnote-compose/src/shapes/cubbez.rs
index e2729d0b32..3d8e0fc82a 100644
--- a/crates/rnote-compose/src/shapes/cubbez.rs
+++ b/crates/rnote-compose/src/shapes/cubbez.rs
@@ -54,11 +54,11 @@ impl Transformable for CubicBezier {
 
 impl Shapeable for CubicBezier {
     fn bounds(&self) -> p2d::bounding_volume::Aabb {
-        self.to_kurbo_bezpath().bounding_box().bounds_to_p2d_aabb()
+        self.outline_path().bounding_box().bounds_to_p2d_aabb()
     }
 
     fn hitboxes(&self) -> Vec<Aabb> {
-        let n_splits = super::hitbox_elems_for_shape_len(self.to_kurbo_bezpath().perimeter(0.25));
+        let n_splits = super::hitbox_elems_for_shape_len(self.outline_path().perimeter(0.25));
 
         self.approx_with_lines(n_splits)
             .into_iter()
@@ -66,7 +66,7 @@ impl Shapeable for CubicBezier {
             .collect()
     }
 
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+    fn outline_path(&self) -> kurbo::BezPath {
         kurbo::CubicBez::new(
             self.start.to_kurbo_point(),
             self.cp1.to_kurbo_point(),
diff --git a/crates/rnote-compose/src/shapes/ellipse.rs b/crates/rnote-compose/src/shapes/ellipse.rs
index f56b3dc248..4e6f23a6cc 100644
--- a/crates/rnote-compose/src/shapes/ellipse.rs
+++ b/crates/rnote-compose/src/shapes/ellipse.rs
@@ -63,7 +63,7 @@ impl Shapeable for Ellipse {
             .collect()
     }
 
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+    fn outline_path(&self) -> kurbo::BezPath {
         (self.transform.affine.to_kurbo()
             * kurbo::Ellipse::new(kurbo::Point::ZERO, self.radii.to_kurbo_vec(), 0.0))
         .to_path(0.25)
@@ -98,7 +98,7 @@ impl Ellipse {
         let mut lines = Vec::new();
         let mut prev = kurbo::Point::new(0.0, 0.0);
 
-        self.to_kurbo_bezpath()
+        self.outline_path()
             .to_path(0.1)
             .flatten(0.1, |el| match el {
                 kurbo::PathEl::MoveTo(point) => prev = point,
diff --git a/crates/rnote-compose/src/shapes/line.rs b/crates/rnote-compose/src/shapes/line.rs
index 053f3d31f2..1d6092d432 100644
--- a/crates/rnote-compose/src/shapes/line.rs
+++ b/crates/rnote-compose/src/shapes/line.rs
@@ -54,7 +54,7 @@ impl Shapeable for Line {
             .collect()
     }
 
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+    fn outline_path(&self) -> kurbo::BezPath {
         kurbo::Line::new(self.start.to_kurbo_point(), self.end.to_kurbo_point()).to_path(0.25)
     }
 }
diff --git a/crates/rnote-compose/src/shapes/polyline.rs b/crates/rnote-compose/src/shapes/polyline.rs
index 20e1563a60..030b089615 100644
--- a/crates/rnote-compose/src/shapes/polyline.rs
+++ b/crates/rnote-compose/src/shapes/polyline.rs
@@ -71,7 +71,7 @@ impl Shapeable for Polyline {
         hitboxes
     }
 
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+    fn outline_path(&self) -> kurbo::BezPath {
         let iter = std::iter::once(kurbo::PathEl::MoveTo(self.start.to_kurbo_point())).chain(
             self.path
                 .iter()
diff --git a/crates/rnote-compose/src/shapes/quadbez.rs b/crates/rnote-compose/src/shapes/quadbez.rs
index 7af2784b6d..2dcb72d346 100644
--- a/crates/rnote-compose/src/shapes/quadbez.rs
+++ b/crates/rnote-compose/src/shapes/quadbez.rs
@@ -48,11 +48,11 @@ impl Transformable for QuadraticBezier {
 
 impl Shapeable for QuadraticBezier {
     fn bounds(&self) -> p2d::bounding_volume::Aabb {
-        self.to_kurbo_bezpath().bounding_box().bounds_to_p2d_aabb()
+        self.outline_path().bounding_box().bounds_to_p2d_aabb()
     }
 
     fn hitboxes(&self) -> Vec<Aabb> {
-        let n_splits = super::hitbox_elems_for_shape_len(self.to_kurbo_bezpath().perimeter(0.25));
+        let n_splits = super::hitbox_elems_for_shape_len(self.outline_path().perimeter(0.25));
 
         self.approx_with_lines(n_splits)
             .into_iter()
@@ -60,7 +60,7 @@ impl Shapeable for QuadraticBezier {
             .collect()
     }
 
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+    fn outline_path(&self) -> kurbo::BezPath {
         kurbo::QuadBez::new(
             self.start.to_kurbo_point(),
             self.cp.to_kurbo_point(),
diff --git a/crates/rnote-compose/src/shapes/rectangle.rs b/crates/rnote-compose/src/shapes/rectangle.rs
index 7c8375a489..6b3b621423 100644
--- a/crates/rnote-compose/src/shapes/rectangle.rs
+++ b/crates/rnote-compose/src/shapes/rectangle.rs
@@ -49,7 +49,7 @@ impl Shapeable for Rectangle {
             .collect()
     }
 
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+    fn outline_path(&self) -> kurbo::BezPath {
         let tl = self.transform.affine
             * na::point![-self.cuboid.half_extents[0], -self.cuboid.half_extents[1]];
         let tr = self.transform.affine
diff --git a/crates/rnote-compose/src/shapes/shape.rs b/crates/rnote-compose/src/shapes/shape.rs
index 46be0dbe94..28b06431a8 100644
--- a/crates/rnote-compose/src/shapes/shape.rs
+++ b/crates/rnote-compose/src/shapes/shape.rs
@@ -142,15 +142,15 @@ impl Shapeable for Shape {
         }
     }
 
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+    fn outline_path(&self) -> kurbo::BezPath {
         match self {
-            Self::Arrow(arrow) => arrow.to_kurbo_bezpath(),
-            Self::Line(line) => line.to_kurbo_bezpath(),
-            Self::Rectangle(rectangle) => rectangle.to_kurbo_bezpath(),
-            Self::Ellipse(ellipse) => ellipse.to_kurbo_bezpath(),
-            Self::QuadraticBezier(quadbez) => quadbez.to_kurbo_bezpath(),
-            Self::CubicBezier(cubbez) => cubbez.to_kurbo_bezpath(),
-            Self::Polyline(polyline) => polyline.to_kurbo_bezpath(),
+            Self::Arrow(arrow) => arrow.outline_path(),
+            Self::Line(line) => line.outline_path(),
+            Self::Rectangle(rectangle) => rectangle.outline_path(),
+            Self::Ellipse(ellipse) => ellipse.outline_path(),
+            Self::QuadraticBezier(quadbez) => quadbez.outline_path(),
+            Self::CubicBezier(cubbez) => cubbez.outline_path(),
+            Self::Polyline(polyline) => polyline.outline_path(),
         }
     }
 }
diff --git a/crates/rnote-compose/src/shapes/shapeable.rs b/crates/rnote-compose/src/shapes/shapeable.rs
index bcedcf3f50..92bb96deed 100644
--- a/crates/rnote-compose/src/shapes/shapeable.rs
+++ b/crates/rnote-compose/src/shapes/shapeable.rs
@@ -8,15 +8,15 @@ pub trait Shapeable: Transformable {
     fn bounds(&self) -> Aabb;
     /// The hitboxes of the shape.
     fn hitboxes(&self) -> Vec<Aabb>;
-    /// The absolute position of the types upper-left corner.
+    /// The absolute position of the shapes upper-left corner.
     fn pos(&self) -> na::Vector2<f64> {
         self.bounds().mins.coords
     }
-    /// Set the absolute position of the types upper-left corner.
+    /// Set the absolute position of the shapes upper-left corner.
     fn set_pos(&mut self, pos: na::Vector2<f64>) {
         self.translate(-self.pos());
         self.translate(pos)
     }
-    /// Convert its outline, or if applicable itself to a [kurbo::BezPath].
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath;
+    /// generate the path of its outline, or if applicable itself to a [kurbo::BezPath].
+    fn outline_path(&self) -> kurbo::BezPath;
 }
diff --git a/crates/rnote-compose/src/style/smooth/mod.rs b/crates/rnote-compose/src/style/smooth/mod.rs
index 40feff04af..b5dec4ee56 100644
--- a/crates/rnote-compose/src/style/smooth/mod.rs
+++ b/crates/rnote-compose/src/style/smooth/mod.rs
@@ -25,7 +25,7 @@ impl Composer<SmoothOptions> for Line {
 
     fn draw_composed(&self, cx: &mut impl piet::RenderContext, options: &SmoothOptions) {
         cx.save().unwrap();
-        let line = self.to_kurbo_bezpath();
+        let line = self.outline_path();
 
         if let Some(stroke_color) = options.stroke_color {
             let stroke_brush = cx.solid_brush(stroke_color.into());
@@ -64,7 +64,7 @@ impl Composer<SmoothOptions> for Rectangle {
 
     fn draw_composed(&self, cx: &mut impl piet::RenderContext, options: &SmoothOptions) {
         cx.save().unwrap();
-        let shape = self.to_kurbo_bezpath();
+        let shape = self.outline_path();
 
         if let Some(fill_color) = options.fill_color {
             let fill_brush = cx.solid_brush(fill_color.into());
@@ -86,7 +86,7 @@ impl Composer<SmoothOptions> for Ellipse {
 
     fn draw_composed(&self, cx: &mut impl piet::RenderContext, options: &SmoothOptions) {
         cx.save().unwrap();
-        let ellipse = self.to_kurbo_bezpath();
+        let ellipse = self.outline_path();
 
         if let Some(fill_color) = options.fill_color {
             let fill_brush = cx.solid_brush(fill_color.into());
@@ -108,7 +108,7 @@ impl Composer<SmoothOptions> for QuadraticBezier {
 
     fn draw_composed(&self, cx: &mut impl piet::RenderContext, options: &SmoothOptions) {
         cx.save().unwrap();
-        let quadbez = self.to_kurbo_bezpath();
+        let quadbez = self.outline_path();
 
         if let Some(fill_color) = options.fill_color {
             let fill_brush = cx.solid_brush(fill_color.into());
@@ -130,7 +130,7 @@ impl Composer<SmoothOptions> for CubicBezier {
 
     fn draw_composed(&self, cx: &mut impl piet::RenderContext, options: &SmoothOptions) {
         cx.save().unwrap();
-        let cubbez = self.to_kurbo_bezpath();
+        let cubbez = self.outline_path();
 
         if let Some(fill_color) = options.fill_color {
             let fill_brush = cx.solid_brush(fill_color.into());
@@ -165,7 +165,7 @@ impl Composer<SmoothOptions> for Polyline {
             );
         } else {
             cx.stroke_styled(
-                self.to_kurbo_bezpath(),
+                self.outline_path(),
                 &Into::<piet::Color>::into(color),
                 options.stroke_width,
                 &piet::StrokeStyle::default()
@@ -239,7 +239,7 @@ impl Composer<SmoothOptions> for PenPath {
                             end: end.pos,
                         };
                         let n_splits = penpath::no_subsegments_for_segment_len(
-                            quadbez.to_kurbo_bezpath().perimeter(0.25),
+                            quadbez.outline_path().perimeter(0.25),
                         )
                         .max(2);
                         let lines = quadbez.approx_with_lines(n_splits);
@@ -266,7 +266,7 @@ impl Composer<SmoothOptions> for PenPath {
                             end: end.pos,
                         };
                         let n_splits = penpath::no_subsegments_for_segment_len(
-                            cubbez.to_kurbo_bezpath().perimeter(0.25),
+                            cubbez.outline_path().perimeter(0.25),
                         )
                         .max(2);
                         let lines = cubbez.approx_with_lines(n_splits);
diff --git a/crates/rnote-engine/src/strokes/bitmapimage.rs b/crates/rnote-engine/src/strokes/bitmapimage.rs
index 03b6b6175d..7d74732235 100644
--- a/crates/rnote-engine/src/strokes/bitmapimage.rs
+++ b/crates/rnote-engine/src/strokes/bitmapimage.rs
@@ -75,7 +75,7 @@ impl Shapeable for BitmapImage {
         vec![self.bounds()]
     }
 
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+    fn outline_path(&self) -> kurbo::BezPath {
         self.bounds().to_kurbo_rect().to_path(0.25)
     }
 }
diff --git a/crates/rnote-engine/src/strokes/brushstroke.rs b/crates/rnote-engine/src/strokes/brushstroke.rs
index b4646c9443..8c14baea16 100644
--- a/crates/rnote-engine/src/strokes/brushstroke.rs
+++ b/crates/rnote-engine/src/strokes/brushstroke.rs
@@ -184,7 +184,7 @@ impl Content for BrushStroke {
             cx.fill(bounds.to_kurbo_rect(), &content::CONTENT_HIGHLIGHT_COLOR);
         } else {
             cx.stroke_styled(
-                self.to_kurbo_bezpath(),
+                self.outline_path(),
                 &content::CONTENT_HIGHLIGHT_COLOR,
                 (PATH_HIGHLIGHT_MIN_STROKE_WIDTH / total_zoom)
                     .max(self.style.stroke_width() + 3.0 / total_zoom),
@@ -232,8 +232,8 @@ impl Shapeable for BrushStroke {
         self.hitboxes.clone()
     }
 
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
-        self.path.to_kurbo_bezpath()
+    fn outline_path(&self) -> kurbo::BezPath {
+        self.path.outline_path()
     }
 }
 
diff --git a/crates/rnote-engine/src/strokes/content.rs b/crates/rnote-engine/src/strokes/content.rs
index 470ded8a6f..1594bd991b 100644
--- a/crates/rnote-engine/src/strokes/content.rs
+++ b/crates/rnote-engine/src/strokes/content.rs
@@ -82,7 +82,7 @@ where
         const HIGHLIGHT_STROKE_WIDTH: f64 = 1.5;
         const DRAW_BOUNDS_THRESHOLD_AREA: f64 = 10_u32.pow(2) as f64;
         let bounds = self.bounds();
-        let bez_path = self.to_kurbo_bezpath();
+        let bez_path = self.outline_path();
 
         if bounds.scale(total_zoom).volume() < DRAW_BOUNDS_THRESHOLD_AREA {
             cx.fill(bounds.to_kurbo_rect(), &CONTENT_HIGHLIGHT_COLOR);
diff --git a/crates/rnote-engine/src/strokes/shapestroke.rs b/crates/rnote-engine/src/strokes/shapestroke.rs
index 547e17af80..82b58527f4 100644
--- a/crates/rnote-engine/src/strokes/shapestroke.rs
+++ b/crates/rnote-engine/src/strokes/shapestroke.rs
@@ -31,7 +31,7 @@ impl Content for ShapeStroke {
         const PATH_HIGHLIGHT_MIN_STROKE_WIDTH: f64 = 5.0;
         const DRAW_BOUNDS_THRESHOLD_AREA: f64 = 10_u32.pow(2) as f64;
         let bounds = self.bounds();
-        let bez_path = self.shape.to_kurbo_bezpath();
+        let bez_path = self.shape.outline_path();
 
         if bounds.scale(total_zoom).volume() < DRAW_BOUNDS_THRESHOLD_AREA {
             cx.fill(bounds.to_kurbo_rect(), &content::CONTENT_HIGHLIGHT_COLOR);
@@ -79,8 +79,8 @@ impl Shapeable for ShapeStroke {
         self.hitboxes.clone()
     }
 
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
-        self.shape.to_kurbo_bezpath()
+    fn outline_path(&self) -> kurbo::BezPath {
+        self.shape.outline_path()
     }
 }
 
diff --git a/crates/rnote-engine/src/strokes/stroke.rs b/crates/rnote-engine/src/strokes/stroke.rs
index 25f755e169..e3fa5cfe96 100644
--- a/crates/rnote-engine/src/strokes/stroke.rs
+++ b/crates/rnote-engine/src/strokes/stroke.rs
@@ -128,13 +128,13 @@ impl Shapeable for Stroke {
         }
     }
 
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+    fn outline_path(&self) -> kurbo::BezPath {
         match self {
-            Self::BrushStroke(brushstroke) => brushstroke.to_kurbo_bezpath(),
-            Self::ShapeStroke(shapestroke) => shapestroke.to_kurbo_bezpath(),
-            Self::TextStroke(textstroke) => textstroke.to_kurbo_bezpath(),
-            Self::VectorImage(vectorimage) => vectorimage.to_kurbo_bezpath(),
-            Self::BitmapImage(bitmapimage) => bitmapimage.to_kurbo_bezpath(),
+            Self::BrushStroke(brushstroke) => brushstroke.outline_path(),
+            Self::ShapeStroke(shapestroke) => shapestroke.outline_path(),
+            Self::TextStroke(textstroke) => textstroke.outline_path(),
+            Self::VectorImage(vectorimage) => vectorimage.outline_path(),
+            Self::BitmapImage(bitmapimage) => bitmapimage.outline_path(),
         }
     }
 }
diff --git a/crates/rnote-engine/src/strokes/textstroke.rs b/crates/rnote-engine/src/strokes/textstroke.rs
index eb9ab66ac6..f4662e8708 100644
--- a/crates/rnote-engine/src/strokes/textstroke.rs
+++ b/crates/rnote-engine/src/strokes/textstroke.rs
@@ -480,7 +480,7 @@ impl Shapeable for TextStroke {
         hitboxes
     }
 
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+    fn outline_path(&self) -> kurbo::BezPath {
         self.bounds().to_kurbo_rect().to_path(0.25)
     }
 }
diff --git a/crates/rnote-engine/src/strokes/vectorimage.rs b/crates/rnote-engine/src/strokes/vectorimage.rs
index 68fc9ee1ea..4a6163ddd9 100644
--- a/crates/rnote-engine/src/strokes/vectorimage.rs
+++ b/crates/rnote-engine/src/strokes/vectorimage.rs
@@ -115,7 +115,7 @@ impl Shapeable for VectorImage {
         vec![self.bounds()]
     }
 
-    fn to_kurbo_bezpath(&self) -> kurbo::BezPath {
+    fn outline_path(&self) -> kurbo::BezPath {
         self.bounds().to_kurbo_rect().to_path(0.25)
     }
 }

From b3b307e35c332ac9fc8db0cf3bad9796cc9ea1f1 Mon Sep 17 00:00:00 2001
From: Felix Zwettler <f.zwettler@posteo.de>
Date: Tue, 15 Aug 2023 23:21:36 +0200
Subject: [PATCH 06/10] remove redundant `to_path()`, adjust flatten tolerance

---
 crates/rnote-compose/src/shapes/ellipse.rs   | 24 +++++++++-----------
 crates/rnote-compose/src/shapes/shapeable.rs |  2 +-
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/crates/rnote-compose/src/shapes/ellipse.rs b/crates/rnote-compose/src/shapes/ellipse.rs
index 4e6f23a6cc..c84ca25495 100644
--- a/crates/rnote-compose/src/shapes/ellipse.rs
+++ b/crates/rnote-compose/src/shapes/ellipse.rs
@@ -98,19 +98,17 @@ impl Ellipse {
         let mut lines = Vec::new();
         let mut prev = kurbo::Point::new(0.0, 0.0);
 
-        self.outline_path()
-            .to_path(0.1)
-            .flatten(0.1, |el| match el {
-                kurbo::PathEl::MoveTo(point) => prev = point,
-                kurbo::PathEl::LineTo(next) => {
-                    lines.push(Line {
-                        start: na::vector![prev.x, prev.y],
-                        end: na::vector![next.x, next.y],
-                    });
-                    prev = next
-                }
-                _ => {}
-            });
+        self.outline_path().flatten(0.25, |el| match el {
+            kurbo::PathEl::MoveTo(point) => prev = point,
+            kurbo::PathEl::LineTo(next) => {
+                lines.push(Line {
+                    start: na::vector![prev.x, prev.y],
+                    end: na::vector![next.x, next.y],
+                });
+                prev = next
+            }
+            _ => {}
+        });
 
         lines
     }
diff --git a/crates/rnote-compose/src/shapes/shapeable.rs b/crates/rnote-compose/src/shapes/shapeable.rs
index 92bb96deed..34a132f040 100644
--- a/crates/rnote-compose/src/shapes/shapeable.rs
+++ b/crates/rnote-compose/src/shapes/shapeable.rs
@@ -17,6 +17,6 @@ pub trait Shapeable: Transformable {
         self.translate(-self.pos());
         self.translate(pos)
     }
-    /// generate the path of its outline, or if applicable itself to a [kurbo::BezPath].
+    /// generate the path of its outline, or if applicable itself as a [kurbo::BezPath].
     fn outline_path(&self) -> kurbo::BezPath;
 }

From cfa2fb1d0f6dcc9d5e401a7dab843c4bf4c63f8f Mon Sep 17 00:00:00 2001
From: Felix Zwettler <f.zwettler@posteo.de>
Date: Tue, 15 Aug 2023 23:22:55 +0200
Subject: [PATCH 07/10] clean up import section

---
 crates/rnote-compose/src/shapes/polyline.rs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/crates/rnote-compose/src/shapes/polyline.rs b/crates/rnote-compose/src/shapes/polyline.rs
index 030b089615..9e4bb4d92e 100644
--- a/crates/rnote-compose/src/shapes/polyline.rs
+++ b/crates/rnote-compose/src/shapes/polyline.rs
@@ -1,11 +1,9 @@
-use p2d::bounding_volume::Aabb;
 // Imports
-use serde::{Deserialize, Serialize};
-
+use super::{Line, Shapeable};
 use crate::ext::Vector2Ext;
 use crate::transform::Transformable;
-
-use super::{Line, Shapeable};
+use p2d::bounding_volume::Aabb;
+use serde::{Deserialize, Serialize};
 
 #[derive(Debug, Clone, Default, Serialize, Deserialize)]
 #[serde(default, rename = "polyline")]

From 9cff7243ec2308f2ea6b27eed72c559b7771820e Mon Sep 17 00:00:00 2001
From: Felix Zwettler <f.zwettler@posteo.de>
Date: Wed, 16 Aug 2023 08:41:55 +0200
Subject: [PATCH 08/10] indicate polyline builder finish

---
 .../src/builders/polylinebuilder.rs           | 49 ++++++++++++-------
 crates/rnote-compose/src/style/indicators.rs  | 45 +++++++++++++++++
 2 files changed, 76 insertions(+), 18 deletions(-)

diff --git a/crates/rnote-compose/src/builders/polylinebuilder.rs b/crates/rnote-compose/src/builders/polylinebuilder.rs
index 9e500b2769..68fb731b53 100644
--- a/crates/rnote-compose/src/builders/polylinebuilder.rs
+++ b/crates/rnote-compose/src/builders/polylinebuilder.rs
@@ -17,13 +17,15 @@ use std::time::Instant;
 pub struct PolylineBuilder {
     /// Start position.
     start: na::Vector2<f64>,
-    /// Current position.
+    /// Position of the next/current path segment.
     current: na::Vector2<f64>,
-    /// Path
+    /// Path.
     path: Vec<na::Vector2<f64>>,
-    /// Pen state
+    /// Pen state.
     pen_state: PenState,
-    /// Finish the polyline on the next `PenEvent::Up`
+    /// Pen position.
+    pen_pos: na::Vector2<f64>,
+    /// Finish the polyline on the next `PenEvent::Up`.
     finish: bool,
 }
 
@@ -34,6 +36,7 @@ impl ShapeBuilderCreator for PolylineBuilder {
             current: element.pos,
             path: Vec::new(),
             pen_state: PenState::Down,
+            pen_pos: element.pos,
             finish: false,
         }
     }
@@ -53,33 +56,30 @@ impl ShapeBuildable for PolylineBuilder {
         match event {
             PenEvent::Down { element, .. } => {
                 if (self.pen_state == PenState::Up || self.pen_state == PenState::Proximity)
-                    && (element.pos - self.path.last().copied().unwrap_or(self.start)).magnitude()
-                        < Self::FINISH_TRESHOLD_DIST
+                    && self.pos_in_finish(element.pos)
                 {
                     self.finish = true;
                 }
                 self.pen_state = PenState::Down;
-
-                if let Some(last) = self.path.last() {
-                    self.current = constraints.constrain(element.pos - *last) + *last;
-                } else {
-                    self.current = constraints.constrain(element.pos - self.start) + self.start;
-                }
+                self.pen_pos = element.pos;
+                let last_pos = self.path.last().copied().unwrap_or(self.start);
+                self.current = constraints.constrain(element.pos - last_pos) + last_pos;
             }
-            PenEvent::Up { .. } => {
+            PenEvent::Up { element, .. } => {
                 if self.finish {
                     return ShapeBuilderProgress::Finished(vec![Shape::Polyline(
                         self.state_as_polyline(),
                     )]);
                 }
-
                 if self.pen_state == PenState::Down {
                     self.path.push(self.current);
                 }
                 self.pen_state = PenState::Up;
+                self.pen_pos = element.pos;
             }
-            PenEvent::Proximity { .. } => {
+            PenEvent::Proximity { element, .. } => {
                 self.pen_state = PenState::Proximity;
+                self.pen_pos = element.pos;
             }
             PenEvent::KeyPressed { keyboard_key, .. } => {
                 if keyboard_key == KeyboardKey::Escape {
@@ -88,8 +88,10 @@ impl ShapeBuildable for PolylineBuilder {
                     )]);
                 }
             }
-            _ => {
+            PenEvent::Text { .. } => {}
+            PenEvent::Cancel => {
                 self.pen_state = PenState::Up;
+                self.finish = false;
             }
         }
 
@@ -115,11 +117,17 @@ impl ShapeBuildable for PolylineBuilder {
         if !self.finish {
             polyline.path.push(self.current);
         }
-        polyline.draw_composed(cx, style);
 
+        polyline.draw_composed(cx, style);
         indicators::draw_pos_indicator(cx, PenState::Up, self.start, zoom);
         if !self.finish {
-            indicators::draw_pos_indicator(cx, PenState::Down, self.current, zoom);
+            if self.pos_in_finish(self.pen_pos)
+                && (self.pen_state == PenState::Up || self.pen_state == PenState::Proximity)
+            {
+                indicators::draw_finish_indicator(cx, self.pen_state, self.current, zoom);
+            } else {
+                indicators::draw_pos_indicator(cx, self.pen_state, self.current, zoom);
+            }
         }
 
         cx.restore().unwrap();
@@ -136,4 +144,9 @@ impl PolylineBuilder {
             path: self.path.clone(),
         }
     }
+
+    fn pos_in_finish(&self, pos: na::Vector2<f64>) -> bool {
+        (pos - self.path.last().copied().unwrap_or(self.start)).magnitude()
+            < Self::FINISH_TRESHOLD_DIST
+    }
 }
diff --git a/crates/rnote-compose/src/style/indicators.rs b/crates/rnote-compose/src/style/indicators.rs
index e8d585fcca..30079685a8 100644
--- a/crates/rnote-compose/src/style/indicators.rs
+++ b/crates/rnote-compose/src/style/indicators.rs
@@ -84,6 +84,51 @@ pub fn draw_vec_indicator(
     cx.stroke(vec_indicator, &line_color, VEC_INDICATOR_LINE_WIDTH / zoom);
 }
 
+// Finish indicator
+
+/// Finish indicator radius.
+pub const FINISH_INDICATOR_RADIUS: f64 = 5.0;
+/// Finish indicator outline width.
+pub const FINISH_INDICATOR_OUTLINE_WIDTH: f64 = 5.0;
+
+/// A finish indicator shape.
+pub fn finish_indicator_shape(
+    _node_state: PenState,
+    pos: na::Vector2<f64>,
+    zoom: f64,
+) -> kurbo::Circle {
+    kurbo::Circle::new(
+        pos.to_kurbo_point(),
+        (FINISH_INDICATOR_RADIUS - FINISH_INDICATOR_OUTLINE_WIDTH * 0.5) / zoom,
+    )
+}
+
+/// Draw a finish indicator.
+pub fn draw_finish_indicator(
+    cx: &mut impl RenderContext,
+    node_state: PenState,
+    pos: na::Vector2<f64>,
+    zoom: f64,
+) {
+    const FILL_COLOR: piet::Color = color::GNOME_GREENS[3].with_a8(176);
+    const OUTLINE_COLOR: piet::Color = color::GNOME_GREENS[4];
+
+    let finish_indicator = finish_indicator_shape(node_state, pos, zoom);
+
+    match node_state {
+        PenState::Up => {}
+        PenState::Proximity => {}
+        PenState::Down => {
+            cx.fill(finish_indicator, &FILL_COLOR);
+        }
+    }
+    cx.stroke(
+        finish_indicator,
+        &OUTLINE_COLOR,
+        POS_INDICATOR_OUTLINE_WIDTH / zoom,
+    );
+}
+
 // Rectangular node
 
 /// Rectangular node outline width.

From 6971c779765f58aeaf3faa0f3345b780248037c3 Mon Sep 17 00:00:00 2001
From: Felix Zwettler <f.zwettler@posteo.de>
Date: Wed, 16 Aug 2023 10:01:58 +0200
Subject: [PATCH 09/10] add pressing enter to finish polyline builder

---
 crates/rnote-compose/src/builders/polylinebuilder.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/crates/rnote-compose/src/builders/polylinebuilder.rs b/crates/rnote-compose/src/builders/polylinebuilder.rs
index 68fb731b53..98da6b12b2 100644
--- a/crates/rnote-compose/src/builders/polylinebuilder.rs
+++ b/crates/rnote-compose/src/builders/polylinebuilder.rs
@@ -81,13 +81,14 @@ impl ShapeBuildable for PolylineBuilder {
                 self.pen_state = PenState::Proximity;
                 self.pen_pos = element.pos;
             }
-            PenEvent::KeyPressed { keyboard_key, .. } => {
-                if keyboard_key == KeyboardKey::Escape {
+            PenEvent::KeyPressed { keyboard_key, .. } => match keyboard_key {
+                KeyboardKey::Escape | KeyboardKey::CarriageReturn | KeyboardKey::Linefeed => {
                     return ShapeBuilderProgress::Finished(vec![Shape::Polyline(
                         self.state_as_polyline(),
                     )]);
                 }
-            }
+                _ => {}
+            },
             PenEvent::Text { .. } => {}
             PenEvent::Cancel => {
                 self.pen_state = PenState::Up;

From 66ead33a1d93843cff4d09391b8e1fb7fb3ef26e Mon Sep 17 00:00:00 2001
From: Felix Zwettler <f.zwettler@posteo.de>
Date: Wed, 16 Aug 2023 10:53:21 +0200
Subject: [PATCH 10/10] update shape builder category string, update po
 template

---
 crates/rnote-ui/po/rnote.pot                  | 30 +++++++++++--------
 crates/rnote-ui/src/penssidebar/shaperpage.rs |  2 +-
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/crates/rnote-ui/po/rnote.pot b/crates/rnote-ui/po/rnote.pot
index 237391e169..0b56bb6eb8 100644
--- a/crates/rnote-ui/po/rnote.pot
+++ b/crates/rnote-ui/po/rnote.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: rnote\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-05 16:42+0200\n"
+"POT-Creation-Date: 2023-08-16 10:52+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1351,7 +1351,7 @@ msgid "Lines"
 msgstr ""
 
 #: crates/rnote-ui/data/ui/settingspanel.ui:342
-#: crates/rnote-ui/src/penssidebar/shaperpage.rs:388
+#: crates/rnote-ui/src/penssidebar/shaperpage.rs:389
 msgid "Grid"
 msgstr ""
 
@@ -2024,49 +2024,53 @@ msgid "Ellipses"
 msgstr ""
 
 #: crates/rnote-ui/src/penssidebar/shaperpage.rs:372
-msgid "Curves"
+msgid "Curves & Paths"
 msgstr ""
 
-#: crates/rnote-ui/src/penssidebar/shaperpage.rs:385
+#: crates/rnote-ui/src/penssidebar/shaperpage.rs:386
 msgid "Arrow"
 msgstr ""
 
-#: crates/rnote-ui/src/penssidebar/shaperpage.rs:386
+#: crates/rnote-ui/src/penssidebar/shaperpage.rs:387
 msgid "Line"
 msgstr ""
 
-#: crates/rnote-ui/src/penssidebar/shaperpage.rs:387
+#: crates/rnote-ui/src/penssidebar/shaperpage.rs:388
 msgid "Rectangle"
 msgstr ""
 
-#: crates/rnote-ui/src/penssidebar/shaperpage.rs:389
+#: crates/rnote-ui/src/penssidebar/shaperpage.rs:390
 msgid "2D coordinate system"
 msgstr ""
 
-#: crates/rnote-ui/src/penssidebar/shaperpage.rs:390
+#: crates/rnote-ui/src/penssidebar/shaperpage.rs:391
 msgid "3D coordinate system"
 msgstr ""
 
-#: crates/rnote-ui/src/penssidebar/shaperpage.rs:391
+#: crates/rnote-ui/src/penssidebar/shaperpage.rs:392
 msgid "2D single quadrant coordinate system"
 msgstr ""
 
-#: crates/rnote-ui/src/penssidebar/shaperpage.rs:392
+#: crates/rnote-ui/src/penssidebar/shaperpage.rs:393
 msgid "Ellipse"
 msgstr ""
 
-#: crates/rnote-ui/src/penssidebar/shaperpage.rs:393
+#: crates/rnote-ui/src/penssidebar/shaperpage.rs:394
 msgid "Ellipse with foci"
 msgstr ""
 
-#: crates/rnote-ui/src/penssidebar/shaperpage.rs:394
+#: crates/rnote-ui/src/penssidebar/shaperpage.rs:395
 msgid "Quadratic bezier curve"
 msgstr ""
 
-#: crates/rnote-ui/src/penssidebar/shaperpage.rs:395
+#: crates/rnote-ui/src/penssidebar/shaperpage.rs:396
 msgid "Cubic bezier curve"
 msgstr ""
 
+#: crates/rnote-ui/src/penssidebar/shaperpage.rs:397
+msgid "Polyline"
+msgstr ""
+
 #: crates/rnote-ui/src/settingspanel/mod.rs:568
 msgid "Application restart is required"
 msgstr ""
diff --git a/crates/rnote-ui/src/penssidebar/shaperpage.rs b/crates/rnote-ui/src/penssidebar/shaperpage.rs
index 9305f30f67..e338aa975d 100644
--- a/crates/rnote-ui/src/penssidebar/shaperpage.rs
+++ b/crates/rnote-ui/src/penssidebar/shaperpage.rs
@@ -369,7 +369,7 @@ fn shape_builder_type_icons_get_groups() -> Vec<GroupedIconPickerGroupData> {
             ]),
         },
         GroupedIconPickerGroupData {
-            name: gettext("Curves"),
+            name: gettext("Curves & Paths"),
             icons: StringList::new(&[
                 "shapebuilder-quadbez-symbolic",
                 "shapebuilder-cubbez-symbolic",