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

Merge pull request #2927 from penpot/alotor-fix-auto-size

Browse source 
Fix auto size
This commit is contained in:
Eva Marco 2023-02-09 13:51:03 +01:00 • committed by GitHub
commit 9c99d86e08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

1
backend/src/app/rpc.clj
View file

@ -7,7 +7,6 @@
(ns app.rpc (ns app.rpc
(:require (:require
[app.auth.ldap :as-alias ldap] [app.auth.ldap :as-alias ldap]
[app.common.data :as d]
[app.common.exceptions :as ex] [app.common.exceptions :as ex]
[app.common.logging :as l] [app.common.logging :as l]
[app.common.spec :as us] [app.common.spec :as us]

6
common/src/app/common/geom/shapes/flex_layout/bounds.cljc
View file

@ -68,6 +68,12 @@
(gpt/add base-p (hv 0.01)) (gpt/add base-p (hv 0.01))
(gpt/add base-p (vv 0.01))] (gpt/add base-p (vv 0.01))]
col?
(conj (gpt/add base-p (vv min-height)))
row?
(conj (gpt/add base-p (hv min-width)))
(and col? h-start?) (and col? h-start?)
(conj (gpt/add base-p (hv min-width))) (conj (gpt/add base-p (hv min-width)))

3
frontend/src/app/main/ui/workspace/sidebar/options/shapes/multiple.cljs
View file

@ -340,8 +340,7 @@
(when-not (empty? measure-ids) (when-not (empty? measure-ids)
[:& measures-menu {:type type :all-types all-types :ids measure-ids :values measure-values :shape shapes}]) [:& measures-menu {:type type :all-types all-types :ids measure-ids :values measure-values :shape shapes}])
(when has-layout-container? [:& layout-container-menu {:type type :ids layout-container-ids :values layout-container-values :multiple true}]
[:& layout-container-menu {:type type :ids layout-container-ids :values layout-container-values :multiple true}])
(when (or is-layout-child? has-layout-container?) (when (or is-layout-child? has-layout-container?)
[:& layout-item-menu [:& layout-item-menu