From c69cb20be1424572a81576875ddb982e2b98e679 Mon Sep 17 00:00:00 2001 From: Eva Date: Mon, 5 Sep 2022 11:17:51 +0200 Subject: [PATCH 1/3] :bug: Fix default grow type in texts --- CHANGES.md | 1 + frontend/src/app/main/data/workspace/drawing/common.cljs | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index c8d5b9cb4..dcc379a4e 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,7 @@ ### :bug: Bugs fixed +- Fix default value of grow type in texts [Taiga #4034](https://tree.taiga.io/project/penpot/issue/4034) - Fix error when moving nested frames outside [Taiga #4017](https://tree.taiga.io/project/penpot/issue/4017) - Fix problem when hovering over nested frames [Taiga #4018](https://tree.taiga.io/project/penpot/issue/4018) - Fix problem editing rotated texts [Taiga #4026](https://tree.taiga.io/project/penpot/issue/4026) diff --git a/frontend/src/app/main/data/workspace/drawing/common.cljs b/frontend/src/app/main/data/workspace/drawing/common.cljs index 03f956aa5..1a1c4757c 100644 --- a/frontend/src/app/main/data/workspace/drawing/common.cljs +++ b/frontend/src/app/main/data/workspace/drawing/common.cljs @@ -46,6 +46,9 @@ shape (cond-> shape + (not click-draw?) + (-> (assoc :grow-type :fixed)) + (and click-draw? (not text?)) (-> (assoc :width min-side :height min-side) (assoc-in [:modifiers :displacement] From 7e4b7424a5d75a538b2506ad46f71230a62c5e67 Mon Sep 17 00:00:00 2001 From: Pablo Alba Date: Mon, 5 Sep 2022 15:11:34 +0200 Subject: [PATCH 2/3] :bug: Fix color-picker recent colors --- CHANGES.md | 1 + .../app/main/ui/workspace/colorpicker.cljs | 30 +++++++++++++------ 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index dcc379a4e..573dc6843 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -17,6 +17,7 @@ - Fix path tools blocking elements underneath [#2050](https://github.com/penpot/penpot/issues/2050) - Fix frame titles deforming when resize [#2207](https://github.com/penpot/penpot/issues/2207) - Fix export simple line path [#3890](https://tree.taiga.io/project/penpot/issue/3890) +- Fix color-picker recent colors [Taiga #4013](https://tree.taiga.io/project/penpot/issue/4013) ## 1.15.1-beta diff --git a/frontend/src/app/main/ui/workspace/colorpicker.cljs b/frontend/src/app/main/ui/workspace/colorpicker.cljs index 16fbf2b47..c7024ec61 100644 --- a/frontend/src/app/main/ui/workspace/colorpicker.cljs +++ b/frontend/src/app/main/ui/workspace/colorpicker.cljs @@ -61,8 +61,17 @@ set-harmony-tab! (mf/use-fn #(reset! active-tab :harmony)) set-hsva-tab! (mf/use-fn #(reset! active-tab :hsva)) + drag? (mf/use-state false) + handle-change-color - (mf/use-fn #(st/emit! (dc/update-colorpicker-color %))) + (mf/use-fn + (mf/deps @drag?) + (fn [color] + (let [recent-color (merge color) + recent-color (dc/materialize-color-components recent-color)] + (when (not @drag?) + (st/emit! (dwl/add-recent-color recent-color))) + (st/emit! (dc/update-colorpicker-color color))))) handle-click-picker (mf/use-fn @@ -96,14 +105,17 @@ on-activate-radial-gradient (mf/use-fn #(st/emit! (dc/activate-colorpicker-gradient :radial-gradient))) + on-start-drag + (mf/use-fn + (fn [] + (reset! drag? true) + (st/emit! (dwu/start-undo-transaction)))) + on-finish-drag (mf/use-fn - (mf/deps state) (fn [] - (let [color (dc/get-color-from-colorpicker-state state)] - (st/emit! - (dwl/add-recent-color color) - (dwu/commit-undo-transaction)))))] + (reset! drag? false) + (st/emit! (dwu/commit-undo-transaction))))] ;; Initialize colorpicker state (mf/with-effect [] @@ -194,21 +206,21 @@ {:color current-color :disable-opacity disable-opacity :on-change handle-change-color - :on-start-drag #(st/emit! (dwu/start-undo-transaction)) + :on-start-drag on-start-drag :on-finish-drag on-finish-drag}] :harmony [:& harmony-selector {:color current-color :disable-opacity disable-opacity :on-change handle-change-color - :on-start-drag #(st/emit! (dwu/start-undo-transaction)) + :on-start-drag on-start-drag :on-finish-drag on-finish-drag}] :hsva [:& hsva-selector {:color current-color :disable-opacity disable-opacity :on-change handle-change-color - :on-start-drag #(st/emit! (dwu/start-undo-transaction)) + :on-start-drag on-start-drag :on-finish-drag on-finish-drag}] nil)) From 00a7760c0f020d31380a98ef301c8f6cacb41cb2 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 6 Sep 2022 12:17:28 +0200 Subject: [PATCH 3/3] :sparkles: Change default task schedule --- backend/src/app/main.clj | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/backend/src/app/main.clj b/backend/src/app/main.clj index 7700c8985..811da6af9 100644 --- a/backend/src/app/main.clj +++ b/backend/src/app/main.clj @@ -358,27 +358,27 @@ :tasks (ig/ref :app.worker/registry) :pool (ig/ref :app.db/pool) :entries - [{:cron #app/cron "0 0 0 * * ?" ;; daily - :task :file-gc} - - {:cron #app/cron "0 0 * * * ?" ;; hourly + [{:cron #app/cron "0 0 * * * ?" ;; hourly :task :file-xlog-gc} - {:cron #app/cron "0 0 0 * * ?" ;; daily - :task :storage-gc-deleted} - - {:cron #app/cron "0 0 0 * * ?" ;; daily - :task :storage-gc-touched} - - {:cron #app/cron "0 0 0 * * ?" ;; daily + {:cron #app/cron "0 0 0 * * ?" ;; daily :task :session-gc} - {:cron #app/cron "0 0 0 * * ?" ;; daily + {:cron #app/cron "0 0 0 * * ?" ;; daily :task :objects-gc} - {:cron #app/cron "0 0 0 * * ?" ;; daily + {:cron #app/cron "0 0 0 * * ?" ;; daily + :task :storage-gc-deleted} + + {:cron #app/cron "0 0 0 * * ?" ;; daily + :task :storage-gc-touched} + + {:cron #app/cron "0 0 0 * * ?" ;; daily :task :tasks-gc} + {:cron #app/cron "0 0 2 * * ?" ;; daily + :task :file-gc} + {:cron #app/cron "0 30 */3,23 * * ?" :task :telemetry}