Gate the gesture-driven calls to set_zoom_mode

Closes baskerville#54.
fmrtn · May 20, 2019 · ac52841 · ac52841
1 parent ad33aa7
commit ac52841
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/doc/MANUAL.md b/doc/MANUAL.md
@@ -65,7 +65,7 @@ Swipe north/south to scroll the page stream when the zoom mode is fit-to-width.
 
 Rotate to change the screen orientation (one finger is the center, the other describes the desired rotation with a circular motion around the center: the two fingers should land and take off simultaneously).
 
-Spread horizontally to switch the zoom mode to fit-to-width.
+Spread (resp. pinch) horizontally to switch the zoom mode to fit-to-width (resp. fit-to-page).
 
 ## Bottom bar
 

diff --git a/src/view/reader/mod.rs b/src/view/reader/mod.rs
@@ -1915,7 +1915,16 @@ impl View for Reader {
  true
  },
  Event::Gesture(GestureEvent::Spread { axis: Axis::Horizontal, starts, .. }) if self.rect.includes(starts[0]) => {
- self.set_zoom_mode(ZoomMode::FitToWidth, hub);
+ if !self.reflowable {
+ self.set_zoom_mode(ZoomMode::FitToWidth, hub);
+ }
+ true
+
+ },
+ Event::Gesture(GestureEvent::Pinch { axis: Axis::Horizontal, starts, .. }) if self.rect.includes(starts[0]) => {
+ if !self.reflowable {
+ self.set_zoom_mode(ZoomMode::FitToPage, hub);
+ }
  true
 
  },