CalvinBackup/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-03-19 00:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse Source
This commit is contained in:
Andrey Antukh
2022-03-24 11:41:33 +01:00
parent 2e3addc6da a753037178
commit 4ed093f28f
6 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
frontend/src/app/main/ui/render.cljs
View File

@@ -7,6 +7,7 @@
(ns app.main.ui.render
(:require
[app.common.data :as d]
[app.common.data.macros :as dm]
[app.common.geom.matrix :as gmt]
[app.common.geom.point :as gpt]
[app.common.geom.shapes :as gsh]
@@ -103,8 +104,8 @@
(mf/with-effect [width height]
(dom/set-page-style!
{:size (str (mth/ceil width) "px "
(mth/ceil height) "px")}))
{:size (dm/str (mth/ceil width) "px "
(mth/ceil height) "px")}))
[:& (mf/provider embed/context) {:value embed?}
[:svg {:id "screenshot"

5
frontend/src/app/main/ui/workspace/sidebar/options/menus/constraints.cljs
View File

@@ -45,12 +45,13 @@
in-frame? (and (some? ids)
(not= (:parent-id values) uuid/zero))
;; TODO: uncomment when fixed-scroll is fully implemented
;; first-level? (and in-frame?
;; (= (:parent-id values) (:frame-id values)))
constraints-h (get values :constraints-h (gsh/default-constraints-h values))
constraints-v (get values :constraints-v (gsh/default-constraints-v values))
constraints-h (or (get values :constraints-h) (gsh/default-constraints-h values))
constraints-v (or (get values :constraints-v) (gsh/default-constraints-v values))
on-constraint-button-clicked
(mf/use-callback