Compare commits
15 Commits
Author | SHA1 | Date | |
---|---|---|---|
0f64758e77 | |||
66d1a585fb | |||
2906360c2e | |||
052cd4b578 | |||
35f0f3c71e | |||
05401941b4 | |||
8ee10214c8 | |||
195e028e22 | |||
acbe27e6e2 | |||
2a86a2bfde | |||
f64bfeb7fd | |||
cb0314d1d6 | |||
6e61113366 | |||
86682a2ad6 | |||
995880e5a3 |
@ -31,8 +31,8 @@ let
|
|||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "lgi-devs";
|
owner = "lgi-devs";
|
||||||
repo = "lgi";
|
repo = "lgi";
|
||||||
rev = "a412921fad445bcfc05a21148722a92ecb93ad06";
|
rev = "e06ad94c8a1c84e3cdb80cee293450a280dfcbc7";
|
||||||
hash = "sha256-kZBpH5gcaCNU134Wn6JXAkFELzmiphc1PeCtmN9cagc=";
|
hash = "sha256-VYr/DV1FAyzPe6p6Quc1nmsHup23IAMfz532rL167Q4=";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
rxi-json = callPackage ../rxi-json { lua = lua5_3; };
|
rxi-json = callPackage ../rxi-json { lua = lua5_3; };
|
||||||
|
@ -143,7 +143,6 @@ label.readout {
|
|||||||
cairo.Content.COLOR
|
cairo.Content.COLOR
|
||||||
(* tile-size (+ 4 num-tiles-x))
|
(* tile-size (+ 4 num-tiles-x))
|
||||||
(* tile-size (+ 4 num-tiles-y)))
|
(* tile-size (+ 4 num-tiles-y)))
|
||||||
seen-road-names {}
|
|
||||||
g (cairo.Context.create map-surface)]
|
g (cairo.Context.create map-surface)]
|
||||||
|
|
||||||
(g:set_source_rgb 0.7 0.8 0.8)
|
(g:set_source_rgb 0.7 0.8 0.8)
|
||||||
@ -158,24 +157,11 @@ label.readout {
|
|||||||
(cairo-roads-path g lines bounds)
|
(cairo-roads-path g lines bounds)
|
||||||
|
|
||||||
(g:set_source_rgb 0.2 0.2 0.2)
|
(g:set_source_rgb 0.2 0.2 0.2)
|
||||||
(g:set_font_size (+ road-width 1))
|
(g:set_font_size (- road-width 3))
|
||||||
(each [_ line (pairs lines)]
|
(each [_ line (pairs lines)]
|
||||||
(case line.name
|
(case line.name
|
||||||
n (let [(x y angle) (label-coords line bounds)
|
n (let [(x y angle) (label-coords line bounds)]
|
||||||
ext (g:text_extents n)
|
(when (and x y)
|
||||||
w ext.width
|
|
||||||
h ext.height]
|
|
||||||
(when (and x y (not (. seen-road-names n)))
|
|
||||||
(tset seen-road-names n true)
|
|
||||||
(g:save)
|
|
||||||
(g:set_line_width h)
|
|
||||||
(g:set_source_rgb 1 1 1)
|
|
||||||
(g:move_to (- x 1) (- y 1))
|
|
||||||
(g:rotate angle)
|
|
||||||
(g:rel_line_to (+ w 1) 0)
|
|
||||||
(g:stroke)
|
|
||||||
(g:restore)
|
|
||||||
|
|
||||||
(g:save)
|
(g:save)
|
||||||
(g:move_to x y)
|
(g:move_to x y)
|
||||||
(g:rotate angle)
|
(g:rotate angle)
|
||||||
|
Loading…
Reference in New Issue
Block a user