-
-
Notifications
You must be signed in to change notification settings - Fork 302
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into libadw-1-4-migration
- Loading branch information
Showing
31 changed files
with
921 additions
and
202 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,153 @@ | ||
| // 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>, | ||
| /// Position of the next/current path segment. | ||
| current: na::Vector2<f64>, | ||
| /// Path. | ||
| path: Vec<na::Vector2<f64>>, | ||
| /// Pen state. | ||
| pen_state: PenState, | ||
| /// Pen position. | ||
| pen_pos: na::Vector2<f64>, | ||
| /// 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, | ||
| pen_pos: element.pos, | ||
| 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 || self.pen_state == PenState::Proximity) | ||
| && self.pos_in_finish(element.pos) | ||
| { | ||
| self.finish = true; | ||
| } | ||
| self.pen_state = PenState::Down; | ||
| 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 { 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 { element, .. } => { | ||
| self.pen_state = PenState::Proximity; | ||
| self.pen_pos = element.pos; | ||
| } | ||
| 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; | ||
| self.finish = false; | ||
| } | ||
| } | ||
|
|
||
| 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 { | ||
| 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(); | ||
| } | ||
| } | ||
|
|
||
| impl PolylineBuilder { | ||
| const FINISH_TRESHOLD_DIST: f64 = 8.0; | ||
|
|
||
| /// The current state as a polyline. | ||
| pub fn state_as_polyline(&self) -> Polyline { | ||
| Polyline { | ||
| start: self.start, | ||
| 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 | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.