refactor

Author: sprocketc

src/renderer/core.cljs

@@ -82,11 +82,11 @@
   []
   (doseq
    [[channel f]
-    [["window-maximized" #(rf/dispatch [::window.e/set-maximized? true])]
-     ["window-unmaximized" #(rf/dispatch [::window.e/set-maximized? false])]
-     ["window-entered-fullscreen" #(rf/dispatch [::window.e/set-fullscreen? true])]
-     ["window-leaved-fullscreen" #(rf/dispatch [::window.e/set-fullscreen? false])]
-     ["window-minimized" #(rf/dispatch [::window.e/set-minimized? true])]]]
+    [["window-maximized" #(rf/dispatch [::window.e/set-maximized true])]
+     ["window-unmaximized" #(rf/dispatch [::window.e/set-maximized false])]
+     ["window-entered-fullscreen" #(rf/dispatch [::window.e/set-fullscreen true])]
+     ["window-leaved-fullscreen" #(rf/dispatch [::window.e/set-fullscreen false])]
+     ["window-minimized" #(rf/dispatch [::window.e/set-minimized true])]]]
     (js/window.api.on channel f)))
 
 (defn handle-system-theme!
@@ -134,6 +134,6 @@
         (rf/dispatch [:load-webref]))
     (.addEventListener js/document
                        "fullscreenchange"
-                       #(rf/dispatch [::window.e/set-fullscreen? (boolean (.-fullscreenElement js/document))])))
+                       #(rf/dispatch [::window.e/set-fullscreen (boolean (.-fullscreenElement js/document))])))
 
   (mount-root))

src/renderer/element/handlers.cljs

@@ -56,13 +56,13 @@
 
 (defn update-bounds
   [db k]
-  (if (= k :canvas)
-    db
-    (as-> db db
-      (update-in db (conj (path db) k) #(assoc % :bounds (if (= (:tag %) :g)
-                                                           (tool/bounds % (elements db))
-                                                           (element/adjusted-bounds % (elements db)))))
-      (reduce #(update-bounds %1 %2) db (children db k)))))
+  (let [update #(assoc % :bounds (if (= (:tag %) :g)
+                                   (tool/bounds % (elements db))
+                                   (element/adjusted-bounds % (elements db))))]
+    (if (= k :canvas)
+      db
+      (-> (reduce update-bounds db (children db k))
+          (update-in (conj (path db) k) update)))))
 
 (defn update-el
   [db k f & more]

src/renderer/window/events.cljs

@@ -5,19 +5,19 @@
    [renderer.window.effects :as fx]))
 
 (rf/reg-event-db
- ::set-maximized?
+ ::set-maximized
  (rf/path :window)
  (fn [db [_ state]]
    (assoc db :maximized? state)))
 
 (rf/reg-event-db
- ::set-fullscreen?
+ ::set-fullscreen
  (rf/path :window)
  (fn [db [_ state]]
    (assoc db :fullscreen? state)))
 
 (rf/reg-event-db
- ::set-minimized?
+ ::set-minimized
  (rf/path :window)
  (fn [db [_ state]]
    (assoc db :minimized? state)))