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

🐛 Fix initial auto-fit of viewport.

Browse source
This commit is contained in:
Andrey Antukh 2020-06-02 11:54:15 +02:00 • committed by Alonso Torres
parent fbd6e395a4
commit bee4e5177c
2 changed files with 51 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

63
frontend/src/uxbox/main/data/workspace.cljs
View file

@ -9,7 +9,6 @@
(ns uxbox.main.data.workspace
(:require
[uxbox.util.debug :refer [logjs]]
[beicon.core :as rx]
[cljs.spec.alpha :as s]
[clojure.set :as set]
@ -197,21 +196,53 @@
(declare zoom-to-fit-all)
;; TODO: add-spec
(defn initialize-viewport
[{:keys [width height] :as size}]
(ptk/reify ::initialize-viewport
ptk/UpdateEvent
(update [_ state]
(update state :workspace-local
(fn [local]
(-> local
(assoc :vport size)
(update :vbox (fn [vbox]
(if (nil? vbox)
(assoc size :x 0 :y 0)
vbox)))))))))
(letfn [(update* [{:keys [vbox vport] :as local}]
(let [wprop (/ (:width vport) width)
hprop (/ (:height vport) height)]
(-> local
(assoc :vport size)
(update :vbox (fn [vbox]
(-> vbox
(update :width #(/ % wprop))
(update :height #(/ % hprop))))))))
(initialize [state local]
(let [page-id (get-in state [:workspace-page :id])
objects (get-in state [:workspace-data page-id :objects])
shapes (cp/select-toplevel-shapes objects {:include-frames? true})
srect (geom/selection-rect shapes)
local (assoc local :vport size)]
(cond
(or (not (mth/finite? (:width srect)))
(not (mth/finite? (:height srect))))
(assoc local :vbox (assoc size :x 0 :y 0))
(or (> (:width srect) width)
(> (:height srect) height))
(let [srect (geom/adjust-to-viewport size srect {:padding 40})
zoom (/ (:width size) (:width srect))]
(-> local
(assoc :zoom zoom)
(update :vbox merge srect)))
:else
(assoc local :vbox (assoc size
:x (- (:x srect) 40)
:y (- (:y srect) 40))))))
(setup [state local]
(if (:vbox local)
(update* local)
(initialize state local)))]
(ptk/reify ::initialize-viewport
ptk/UpdateEvent
(update [_ state]
(update state :workspace-local
(fn [local]
(setup state local)))))))
(defn update-viewport-position
[{:keys [x y] :or {x identity y identity}}]
@ -226,8 +257,6 @@
(update :x x)
(update :y y)))))))
;; TODO: add spec
(defn update-viewport-size
[{:keys [width height] :as size}]
(ptk/reify ::update-viewport-size
@ -368,7 +397,7 @@
(let [page-id (get-in state [:workspace-page :id])
objects (get-in state [:workspace-data page-id :objects])
shapes (cp/select-toplevel-shapes objects {:include-frames? true})
srect (geom/shapes->rect-shape shapes)]
srect (geom/selection-rect shapes)]
(if (or (mth/nan? (:width srect))
(mth/nan? (:height srect)))