From 66c56a367e09de6901da8841dd6c0898c994994a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Sun, 10 Apr 2016 19:24:51 +0200 Subject: [PATCH 1/2] Zoom control widget on the workspace header --- src/uxbox/ui/workspace/header.cljs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/uxbox/ui/workspace/header.cljs b/src/uxbox/ui/workspace/header.cljs index 002490c0f4..5f3159357a 100644 --- a/src/uxbox/ui/workspace/header.cljs +++ b/src/uxbox/ui/workspace/header.cljs @@ -41,9 +41,13 @@ [:li.coordinates {:alt "y"} (str "Y: " (:y coords "-"))] [:li.zoom-input - [:span.add-zoom "+"] - [:span "100%"] - [:span.remove-zoom "-"]]]))) + [:span.add-zoom + {:on-click #(rs/emit! (dw/increase-zoom))} + "+"] + [:span (str (mth/round (* 100 zoom)) "%")] + [:span.remove-zoom + {:on-click #(rs/emit! (dw/decrease-zoom))} + "-"]]]))) (def coordinates (mx/component From b734f303fb4108884826c6b1e12b90c47990f2a1 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Mon, 11 Apr 2016 18:12:15 +0300 Subject: [PATCH 2/2] Cosmetic improvements. --- src/uxbox/ui/workspace/header.cljs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/uxbox/ui/workspace/header.cljs b/src/uxbox/ui/workspace/header.cljs index 5f3159357a..f09ca522ca 100644 --- a/src/uxbox/ui/workspace/header.cljs +++ b/src/uxbox/ui/workspace/header.cljs @@ -33,7 +33,9 @@ (let [zoom (rum/react wb/zoom-l) coords (some-> (rum/react wb/mouse-canvas-a) (gpt/divide zoom) - (gpt/round 1))] + (gpt/round 1)) + increase #(rs/emit! (dw/increase-zoom)) + decrease #(rs/emit! (dw/decrease-zoom))] (html [:ul.options-view [:li.coordinates {:alt "x"} @@ -41,13 +43,9 @@ [:li.coordinates {:alt "y"} (str "Y: " (:y coords "-"))] [:li.zoom-input - [:span.add-zoom - {:on-click #(rs/emit! (dw/increase-zoom))} - "+"] + [:span.add-zoom {:on-click increase} "+"] [:span (str (mth/round (* 100 zoom)) "%")] - [:span.remove-zoom - {:on-click #(rs/emit! (dw/decrease-zoom))} - "-"]]]))) + [:span.remove-zoom {:on-click decrease} "-"]]]))) (def coordinates (mx/component