3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-10 17:06:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

🐛 Fix problem with rulers in Firefox

Browse source
This commit is contained in:
alonso.torres 2024-03-26 17:02:03 +01:00
parent bd88b872c7
commit ef0abc1498
1 changed files with 6 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

17
frontend/src/app/main/ui/workspace/viewport/rulers.cljs
View file

@ -101,13 +101,13 @@
rulers-size (* rulers-size zoom-inverse)] rulers-size (* rulers-size zoom-inverse)]
(if (= axis :x) (if (= axis :x)
{:text-x val {:text-x val
:text-y (+ (:y vbox) (- rulers-pos (* 4 zoom-inverse))) :text-y (+ (:y vbox) rulers-pos (* -1 zoom-inverse))
:line-x1 val :line-x1 val
:line-y1 (+ (:y vbox) rulers-pos (* 2 zoom-inverse)) :line-y1 (+ (:y vbox) rulers-pos (* 2 zoom-inverse))
:line-x2 val :line-x2 val
:line-y2 (+ (:y vbox) rulers-pos (* 2 zoom-inverse) rulers-size)} :line-y2 (+ (:y vbox) rulers-pos (* 2 zoom-inverse) rulers-size)}
{:text-x (+ (:x vbox) (- rulers-pos (* 4 zoom-inverse))) {:text-x (+ (:x vbox) rulers-pos (* -1 zoom-inverse))
:text-y val :text-y val
:line-x1 (+ (:x vbox) rulers-pos (* 2 zoom-inverse)) :line-x1 (+ (:x vbox) rulers-pos (* 2 zoom-inverse))
:line-y1 val :line-y1 val
@ -171,7 +171,6 @@
[:text {:x text-x [:text {:x text-x
:y text-y :y text-y
:text-anchor "middle" :text-anchor "middle"
:dominant-baseline "middle"
:transform (when (= axis :y) (str "rotate(-90 " text-x "," text-y ")")) :transform (when (= axis :y) (str "rotate(-90 " text-x "," text-y ")"))
:style {:font-size (* font-size zoom-inverse) :style {:font-size (* font-size zoom-inverse)
:font-family font-family :font-family font-family
@ -250,18 +249,16 @@
:fill-opacity selection-area-opacity}}] :fill-opacity selection-area-opacity}}]
[:text {:x (- (:x1 selection-rect) (* 4 zoom-inverse)) [:text {:x (- (:x1 selection-rect) (* 4 zoom-inverse))
:y (+ (:y vbox) (* 10.6 zoom-inverse)) :y (+ (:y vbox) (* 13.6 zoom-inverse))
:text-anchor "end" :text-anchor "end"
:dominant-baseline "middle"
:style {:font-size (* font-size zoom-inverse) :style {:font-size (* font-size zoom-inverse)
:font-family font-family :font-family font-family
:fill selection-area-color}} :fill selection-area-color}}
(fmt/format-number (- (:x1 selection-rect) offset-x))] (fmt/format-number (- (:x1 selection-rect) offset-x))]
[:text {:x (+ (:x2 selection-rect) (* 4 zoom-inverse)) [:text {:x (+ (:x2 selection-rect) (* 4 zoom-inverse))
:y (+ (:y vbox) (* 10.6 zoom-inverse)) :y (+ (:y vbox) (* 13.6 zoom-inverse))
:text-anchor "start" :text-anchor "start"
:dominant-baseline "middle"
:style {:font-size (* font-size zoom-inverse) :style {:font-size (* font-size zoom-inverse)
:font-family font-family :font-family font-family
:fill selection-area-color}} :fill selection-area-color}}
@ -293,18 +290,16 @@
:fill-opacity over-number-opacity}}] :fill-opacity over-number-opacity}}]
[:text {:x (- center-x (/ (:height selection-rect) 2) (* 15 zoom-inverse)) [:text {:x (- center-x (/ (:height selection-rect) 2) (* 15 zoom-inverse))
:y center-y :y (+ center-y (* 4 zoom-inverse))
:text-anchor "end" :text-anchor "end"
:dominant-baseline "middle"
:style {:font-size (* font-size zoom-inverse) :style {:font-size (* font-size zoom-inverse)
:font-family font-family :font-family font-family
:fill selection-area-color}} :fill selection-area-color}}
(fmt/format-number (- (:y2 selection-rect) offset-y))] (fmt/format-number (- (:y2 selection-rect) offset-y))]
[:text {:x (+ center-x (/ (:height selection-rect) 2)) [:text {:x (+ center-x (/ (:height selection-rect) 2))
:y center-y :y (+ center-y (* 4 zoom-inverse))
:text-anchor "start" :text-anchor "start"
:dominant-baseline "middle"
:style {:font-size (* font-size zoom-inverse) :style {:font-size (* font-size zoom-inverse)
:font-family font-family :font-family font-family
:fill selection-area-color}} :fill selection-area-color}}