From 3605a4b7ea98cdaece359e27be032ad0edb1a233 Mon Sep 17 00:00:00 2001 From: malc Date: Mon, 5 Mar 2012 04:00:00 +0400 Subject: [PATCH] Further split columns improvements --- main.ml | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/main.ml b/main.ml index 8fe23b1..95f88fa 100644 --- a/main.ml +++ b/main.ml @@ -1204,7 +1204,7 @@ let layoutS (columns, b) y sh = let pagedispy = if pagey > 0 then 0 else vy - y in let pagedispx, pagex = if x < 0 - then 0, max 0 (px + x) + then 0, px - x else x, px in let pagevw = @@ -1408,12 +1408,17 @@ let tilevisible1 l x y = ;; let tilevisible layout n x y = - let rec findpageinlayout = function - | l :: _ when l.pageno = n -> tilevisible1 l x y - | _ :: rest -> findpageinlayout rest + let rec findpageinlayout m = function + | l :: rest when l.pageno = n -> + tilevisible1 l x y || ( + match conf.columns with + | Csplit (c, _) when c > m -> findpageinlayout (m+1) rest + | _ -> false + ) + | _ :: rest -> findpageinlayout 0 rest | [] -> false in - findpageinlayout layout + findpageinlayout 0 layout; ;; let tileready l x y = -- 2.11.4.GIT