mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-17 05:14:24 +00:00
Canvas: ease_from and jumped, an app's own view change eases or stops the canvas's zoom ease
This commit is contained in:
@@ -184,6 +184,8 @@ pub struct Canvas<'a> {
|
||||
settled: Option<Settled>,
|
||||
/// The Menu key or Shift+F10 reached the focused canvas this pass.
|
||||
context_key: bool,
|
||||
/// The ease the app asked for from the view it drew ([`ease_from`](Self::ease_from)).
|
||||
ease: Option<Steer>,
|
||||
}
|
||||
|
||||
/// A canvas's view in one pass.
|
||||
@@ -215,6 +217,7 @@ impl<'a> Canvas<'a> {
|
||||
snap: None,
|
||||
settled: None,
|
||||
context_key: false,
|
||||
ease: None,
|
||||
}
|
||||
.label(label)
|
||||
.ltr_axis()
|
||||
@@ -245,6 +248,24 @@ impl<'a> Canvas<'a> {
|
||||
self
|
||||
}
|
||||
|
||||
/// Eases from `from`, the view the app drew last, to the view given this pass, as the canvas eases its own zoom
|
||||
/// commands: an app's zoom step made outside the canvas (a menu row, a Zoom tool click before the app's tools run
|
||||
/// on the tool host). `anchor` keeps a document point under a screen point along the way. With Animated Zoom off,
|
||||
/// or when the wheel or a pan moves the view in the same pass, the view jumps.
|
||||
#[must_use]
|
||||
pub fn ease_from(mut self, from: CanvasView, anchor: Option<(Point, Pos2)>) -> Self {
|
||||
self.ease = Some(Steer::Ease { from, anchor });
|
||||
self
|
||||
}
|
||||
|
||||
/// The app moved the view itself since its last pass (a pan of its own): an ease running stops at the view given
|
||||
/// this pass, as for a pan of the canvas's own.
|
||||
#[must_use]
|
||||
pub fn jumped(mut self) -> Self {
|
||||
self.ease = Some(Steer::Stop);
|
||||
self
|
||||
}
|
||||
|
||||
/// Leaves the view commands to the instance around the canvas that owns its view (a full-window dialog's): the
|
||||
/// canvas is no instance of them, so the chords reach that instance while the canvas has the focus.
|
||||
#[must_use]
|
||||
@@ -335,6 +356,11 @@ impl<'a> Canvas<'a> {
|
||||
}
|
||||
// A pan or a scroll takes over from an ease, here or in a tool.
|
||||
let mut steer = motion.steer.take();
|
||||
match self.ease {
|
||||
Some(Steer::Ease { .. }) if !self.navigation.animated_zoom => steer = Some(Steer::Stop),
|
||||
Some(ease) => steer = Some(ease),
|
||||
None => {}
|
||||
}
|
||||
if jumped {
|
||||
steer = Some(Steer::Stop);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user