Unified · Split
| @@ -4,6 +4,7 @@ open Glutils;; · 3 unmodified lines | |||
| 4 | open Listview;; | 4 | open Listview;; |
| 5 | 5 | ||
| 6 | module C = Ffi.C;; | 6 | module C = Ffi.C;; |
| 7 | |||
| 7 | let selfexec = ref E.s;; | 8 | let selfexec = ref E.s;; |
| 8 | let ignoredoctitlte = ref false;; | 9 | let ignoredoctitlte = ref false;; |
| 9 | let layouth = ref ~-1;; | 10 | let layouth = ref ~-1;; |
| @@ -800,9 +801,6 @@ let reload () = · 790 unmodified lines | |||
| 800 | ;; | 801 | ;; |
| 801 | 802 | ||
| 802 | let scalecolor c = let c = c *. conf.colorscale in (c, c, c);; | 803 | let scalecolor c = let c = c *. conf.colorscale in (c, c, c);; |
| 803 | let scalecolor2 (r, g, b) = | ||
| 804 | (r *. conf.colorscale, g *. conf.colorscale, b *. conf.colorscale); | ||
| 805 | ;; | ||
| 806 | 804 | ||
| 807 | let docolumns columns = | 805 | let docolumns columns = |
| 808 | match columns with | 806 | match columns with |
| @@ -4174,8 +4172,9 @@ let showrects = function · 3365 unmodified lines | |||
| 4174 | ;; | 4172 | ;; |
| 4175 | 4173 | ||
| 4176 | let display () = | 4174 | let display () = |
| 4177 | GlDraw.color (scalecolor2 conf.bgcolor); | 4175 | let sc (r, g, b) = let s = conf.colorscale in (r *. s, g *. s, b *. s) in |
| 4178 | GlClear.color (scalecolor2 conf.bgcolor); | 4176 | GlDraw.color (sc conf.bgcolor); |
| 4177 | GlClear.color (sc conf.bgcolor); | ||
| 4179 | GlClear.clear [`color]; | 4178 | GlClear.clear [`color]; |
| 4180 | List.iter drawpage state.layout; | 4179 | List.iter drawpage state.layout; |
| 4181 | let rects = | 4180 | let rects = |