From 77f7a95a79fb8fd9fff93d200d69417350024924 Mon Sep 17 00:00:00 2001 From: malc Date: Mon, 8 Aug 2011 11:18:39 +0400 Subject: [PATCH] Navigation in bird's eye shouldn't touch nav --- main.ml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/main.ml b/main.ml index 1b77c22..d4771a1 100644 --- a/main.ml +++ b/main.ml @@ -648,6 +648,17 @@ let getnav () = getanchory anchor; ;; +let gotopagenonav n top = + let y, h = getpageyh n in + gotoy_and_clear_text (y + (truncate (top *. float h))); +;; + +let gotopage1nonav n top = + let y, h = getpageyh n in + addnav (); + gotoy_and_clear_text (y + top); +;; + let gotopage n top = let y, h = getpageyh n in addnav (); @@ -1763,7 +1774,7 @@ let birdseyespecial key x y (conf, leftx, pageno, hooverpageno) = | Glut.KEY_UP -> let pageno = max 0 (pageno - 1) in let rec loop = function - | [] -> gotopage1 pageno 0 + | [] -> gotopage1nonav pageno 0 | l :: _ when l.pageno = pageno -> Glut.postRedisplay () | _ :: rest -> loop rest in @@ -1796,12 +1807,12 @@ let birdseyespecial key x y (conf, leftx, pageno, hooverpageno) = | l :: _ -> let pageno = max 0 (l.pageno - 1) in state.birdseye <- Some (conf, leftx, pageno, hooverpageno); - gotopage pageno 0.0 + gotopagenonav pageno 0.0 ) else ( let pageno = max 0 (l.pageno - 1) in state.birdseye <- Some (conf, leftx, pageno, hooverpageno); - gotopage pageno 0.0 + gotopagenonav pageno 0.0 ) | [] -> gotoy (clamp (-conf.winh)) end; @@ -1816,7 +1827,7 @@ let birdseyespecial key x y (conf, leftx, pageno, hooverpageno) = | Glut.KEY_HOME -> state.birdseye <- Some (conf, leftx, 0, hooverpageno); - gotopage 0 0.0 + gotopage1nonav 0 0 | Glut.KEY_END -> let pageno = state.pagecount - 1 in state.birdseye <- Some (conf, leftx, pageno, hooverpageno); -- 2.11.4.GIT