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

🐛 Fixes problems with collaboration cursors

Browse source
This commit is contained in:
alonso.torres 2020-10-28 10:50:10 +01:00 • committed by Hirunatan
parent a6f9678d63
commit 34a9b852ef
1 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

42
frontend/src/app/main/ui/workspace/presence.cljs
View file

@ -10,6 +10,7 @@
(ns app.main.ui.workspace.presence (ns app.main.ui.workspace.presence
(:require (:require
[rumext.alpha :as mf] [rumext.alpha :as mf]
[cuerdas.core :as str]
[beicon.core :as rx] [beicon.core :as rx]
[app.main.refs :as refs] [app.main.refs :as refs]
[app.main.store :as st] [app.main.store :as st]
@ -24,34 +25,39 @@
(mf/defc session-cursor (mf/defc session-cursor
[{:keys [session] :as props}] [{:keys [session] :as props}]
(let [point (:point session) (let [zoom (mf/deref refs/selected-zoom)
point (:point session)
color (:color session "#000000") color (:color session "#000000")
transform (str "translate(" (:x point) "," (:y point) ") scale(4)")] transform (str/fmt "translate(%s, %s) scale(%s)" (:x point) (:y point) (/ 4 zoom))]
[:g.multiuser-cursor {:transform transform} [:g.multiuser-cursor {:transform transform}
[:path {:fill color [:path {:fill color
:d pointer-icon-path :d pointer-icon-path
:font-family "sans-serif"}] :font-family "sans-serif"}]
[:g {:transform "translate(0 -291.708)"} [:g {:transform "translate(0 -291.708)"}
[:rect {:width "21.415" [:rect {:width 25
:height "5.292" :height 5
:x "6.849" :x 7
:y "291.755" :y 291.5
:fill color :fill color
:fill-opacity ".893" :fill-opacity 0.8
:paint-order "stroke fill markers" :paint-order "stroke fill markers"
:rx ".794" :rx 1
:ry ".794"}] :ry 1}]
[:text {:x "9.811" [:text {:x 8
:y "295.216" :y 295
:width 25
:height 5
:overflow "hidden"
:fill "#fff" :fill "#fff"
:stroke-width ".265" :stroke-width 1
:font-family "Open Sans" :font-family "Open Sans"
:font-size"2.91" :font-size 3
:font-weight "400" :font-weight 400
:letter-spacing"0" :letter-spacing 0
:style {:line-height "1.25"} :style { :line-height 1.25 }
:word-spacing "0"} :word-spacing 0}
(:fullname session)]]])) (str (str/slice (:fullname session) 0 14)
(when (> (count (:fullname session)) 14) "..."))]]]))
(mf/defc active-cursors (mf/defc active-cursors
{::mf/wrap [mf/memo]} {::mf/wrap [mf/memo]}