Add simultaneous swipe sequence: diamond

doc/MANUAL.md

@@ -105,7 +105,10 @@ The following swipe sequences are recognized:
 - Bottom left corner: guess the frontlight if there's more than two frontlight presets defined, toggle the frontlight otherwise.
 - Bottom right corner: toggle the bitonal mode.
 
-Simultaneously performing an east arrow with the left hand and a west arrow with the right hand will lead you back to the home screen.
+Simultaneous swipe sequences:
+
+- Cross (east arrow with the left hand, west arrow with the right hand): go back to the home screen.
+- Diamond (west arrow with the left hand, east arrow with the right hand): toggle the top and bottom bars.
 
 ### Text Selection
 

src/gesture.rs

@@ -68,6 +68,7 @@ pub enum GestureEvent {
  angle: f32,
  },
  Cross(Point),
+ Diamond(Point),
  HoldFingerShort(Point, i32),
  HoldFingerLong(Point, i32),
  HoldButtonShort(ButtonCode),
@@ -89,6 +90,7 @@ impl fmt::Display for GestureEvent {
  GestureEvent::Spread { axis, strength, .. } => write!(f, "Spread {} {}", axis, strength),
  GestureEvent::Rotate { center, quarter_turns, .. } => write!(f, "Rotate {} {}", center, quarter_turns * 90),
  GestureEvent::Cross(pt) => write!(f, "Cross {}", pt),
+ GestureEvent::Diamond(pt) => write!(f, "Diamond {}", pt),
  GestureEvent::HoldFingerShort(pt, id) => write!(f, "Short-held finger {} {}", id, pt),
  GestureEvent::HoldFingerLong(pt, id) => write!(f, "Long-held finger {} {}", id, pt),
  GestureEvent::HoldButtonShort(code) => write!(f, "Short-held button {:?}", code),
@@ -226,6 +228,10 @@ pub fn parse_gesture_events(rx: &Receiver<DeviceEvent>, ty: &Sender<Event>) {
  (GestureEvent::Arrow { dir: Dir::West, start: s2, end: e2 }, GestureEvent::Arrow { dir: Dir::East, start: s1, end: e1 }) if s1.x < s2.x => {
  ty.send(Event::Gesture(GestureEvent::Cross((s1+e1+s2+e2)/4))).ok();
  },
+ (GestureEvent::Arrow { dir: Dir::West, start: s1, end: e1 }, GestureEvent::Arrow { dir: Dir::East, start: s2, end: e2 }) |
+ (GestureEvent::Arrow { dir: Dir::East, start: s2, end: e2 }, GestureEvent::Arrow { dir: Dir::West, start: s1, end: e1 }) if s1.x < s2.x => {
+ ty.send(Event::Gesture(GestureEvent::Diamond((s1+e1+s2+e2)/4))).ok();
+ },
  (GestureEvent::Arrow { dir: d1, start: s1, end: e1 }, GestureEvent::Arrow { dir: d2, start: s2, end: e2 }) if d1 == d2 => {
  ty.send(Event::Gesture(GestureEvent::MultiArrow {
  dir: d1,

src/view/reader/mod.rs

@@ -2571,6 +2571,10 @@ impl View for Reader {
  hub.send(Event::Back).ok();
  true
  },
+ Event::Gesture(GestureEvent::Diamond(_)) => {
+ self.toggle_bars(None, hub, rq, context);
+ true
+ },
  Event::Gesture(GestureEvent::HoldButtonShort(code, ..)) => {
  match code {
  ButtonCode::Backward => self.go_to_chapter(CycleDir::Previous, hub, rq, context),