Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-03 21:09:00 -05:00
Code Issues Activity

Some fixes on text ticks on rules.

Browse source
This commit is contained in:
Andrey Antukh 2016-04-05 23:17:57 +03:00
parent c2126b6fe4
commit a21c6f41c4
1 changed files with 9 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/uxbox/ui/workspace/rules.cljs
View file

@ -38,13 +38,10 @@
[zoom acc value] [zoom acc value]
(let [big-ticks-mod (big-ticks-mod zoom) (let [big-ticks-mod (big-ticks-mod zoom)
mid-ticks-mod (mid-ticks-mod zoom) mid-ticks-mod (mid-ticks-mod zoom)
big-step? (< (mod value big-ticks-mod) step-size)
mid-step? (< (mod value mid-ticks-mod) step-size)
pos (+ value pos (+ value
rule-padding rule-padding
wb/canvas-start-x (* wb/canvas-start-x zoom)
wb/canvas-scroll-padding) wb/canvas-scroll-padding)]
pos (* pos zoom)]
(cond (cond
(< (mod value big-ticks-mod) step-size) (< (mod value big-ticks-mod) step-size)
(conj acc (str/format "M %s %s L %s %s" pos 5 pos step-padding)) (conj acc (str/format "M %s %s L %s %s" pos 5 pos step-padding))
@ -60,9 +57,8 @@
(let [big-ticks-mod (big-ticks-mod zoom) (let [big-ticks-mod (big-ticks-mod zoom)
mid-ticks-mod (mid-ticks-mod zoom) mid-ticks-mod (mid-ticks-mod zoom)
pos (+ value pos (+ value
wb/canvas-start-x (* wb/canvas-start-x zoom)
wb/canvas-scroll-padding) wb/canvas-scroll-padding)]
pos (* pos zoom)]
(cond (cond
(< (mod value big-ticks-mod) step-size) (< (mod value big-ticks-mod) step-size)
(conj acc (str/format "M %s %s L %s %s" 5 pos step-padding pos)) (conj acc (str/format "M %s %s L %s %s" 5 pos step-padding pos))
@ -80,9 +76,8 @@
(let [big-ticks-mod (big-ticks-mod zoom) (let [big-ticks-mod (big-ticks-mod zoom)
pos (+ value pos (+ value
rule-padding rule-padding
wb/canvas-start-x (* wb/canvas-start-x zoom)
wb/canvas-scroll-padding) wb/canvas-scroll-padding)]
pos (* pos zoom)]
(when (< (mod value big-ticks-mod) step-size) (when (< (mod value big-ticks-mod) step-size)
(html (html
[:text {:x (+ pos 2) [:text {:x (+ pos 2)
@ -98,9 +93,9 @@
[zoom value] [zoom value]
(let [big-ticks-mod (big-ticks-mod zoom) (let [big-ticks-mod (big-ticks-mod zoom)
pos (+ value pos (+ value
wb/canvas-start-x (* wb/canvas-start-x zoom)
wb/canvas-scroll-padding) ;; wb/canvas-start-x
pos (* pos zoom)] wb/canvas-scroll-padding)]
(when (< (mod value big-ticks-mod) step-size) (when (< (mod value big-ticks-mod) step-size)
(html (html
[:text {:y (- pos 3) [:text {:y (- pos 3)