Less c{ode,onsing,onfusion}

malc committed 6 years ago

Commit 2285e171 parent a9347c01 file · +6 −16Browse files

Unified · Split

        | [] -> ()
        | (pageno, _, (_, y0, _, y1, _, y2, _, y3)) :: _ ->
           f pageno (y0, y1, y2, y3)
-     and yminmax (y0, y1, y2, y3) =
+     and ymin (y0, y1, y2, y3) = min y0 y1 |> min y2 |> min y3 |> truncate
-       let ym = min y0 y1 |> min y2 |> min y3 |> truncate in
+     and ymax (y0, y1, y2, y3) = max y0 y1 |> max y2 |> max y3 |> truncate in
-       let yM = max y0 y1 |> max y2 |> max y3 |> truncate in
-       ym, yM
-     in
      let ondone msg = state.text <- msg
      and zmod _ _ k =
        match [@warning "-fragile-match"] k with
        | Keys.Ascii 'z' ->
           let f pageno ys =
-            let ym, yM = yminmax ys in
+            let hh = (ymax ys - ymin ys)/2 in
-            let hh = (yM - ym)/2 in
+            gotopage1 pageno (ymin ys + hh - state.winh/2)
-            gotopage1 pageno (ym + hh - state.winh/2)
           in
           yloc f;
           TEdone "center"
        | Keys.Ascii 't' ->
-          let f pageno ys =
+          let f pageno ys = gotopage1 pageno @@ ymin ys in
-            let ym, _ = yminmax ys in
-            gotopage1 pageno ym
-          in
           yloc f;
           TEdone "top"
        | Keys.Ascii 'b' ->
-          let f pageno ys =
+          let f pageno ys = gotopage1 pageno (ymax ys - state.winh) in
-            let _, yM = yminmax ys in
-            gotopage1 pageno (yM - state.winh)
-          in
           yloc f;
           TEdone "bottom"
        | _ -> TEstop

Keyboard shortcuts