Skip to content

Commit 889f01c

Browse files
committed
merge modules
1 parent 2fad684 commit 889f01c

File tree

13 files changed

+49
-99
lines changed

13 files changed

+49
-99
lines changed

src/renderer/core.cljs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@
2121
[renderer.frame.core]
2222
[renderer.history.core]
2323
[renderer.notification.core]
24-
[renderer.panel.core]
2524
[renderer.reepl.core]
2625
[renderer.reepl.replumb :as replumb]
2726
[renderer.rulers.core]
2827
[renderer.snap.core]
2928
[renderer.subs]
30-
[renderer.theme.core]
3129
[renderer.timeline.core]
3230
[renderer.tool.core]
3331
[renderer.utils.dom :as dom]

src/renderer/db.cljs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
(ns renderer.db
22
(:require
33
[renderer.document.db]
4-
[renderer.panel.db]
54
[renderer.snap.db]
6-
[renderer.theme.db]
75
[renderer.timeline.db]
86
[renderer.window.db]))
97

@@ -22,9 +20,9 @@
2220
[:system-fonts vector?]
2321
[:debug-info? boolean?]
2422
[:pen-mode? boolean?]
25-
[:panel [:map-of :key renderer.panel.db/panel]]
23+
[:panel [:map-of :key [:map [:visible? boolean?]]]]
2624
[:window renderer.window.db/window]
27-
[:theme [:mode renderer.theme.db/modes]]
25+
[:theme [:mode [:enum :dark :light :system]]]
2826
[:timeline renderer.timeline.db/timeline]])
2927

3028
(def default

src/renderer/events.cljs

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,36 @@
9696
(fn [db [_]]
9797
(update db :grid? not)))
9898

99+
(rf/reg-event-db
100+
:panel/toggle
101+
[local-storage/persist
102+
(rf/path :panel)]
103+
(fn [db [_ key]]
104+
(update-in db [key :visible?] not)))
105+
106+
(rf/reg-event-fx
107+
:theme/init-mode
108+
(fn [{:keys [db]} _]
109+
(let [mode (-> db :theme :mode name)]
110+
{:set-attribute [js/window.document.documentElement "data-theme" mode]
111+
:send-to-main {:action "setThemeMode" :data mode}})))
112+
113+
(rf/reg-event-fx
114+
:theme/set-mode
115+
local-storage/persist
116+
(fn [{:keys [db]} [_ mode]]
117+
{:db (assoc-in db [:theme :mode] mode)
118+
:dispatch [:theme/init-mode]}))
119+
120+
(rf/reg-event-fx
121+
:theme/cycle-mode
122+
(fn [{:keys [db]} [_]]
123+
(let [mode (case (-> db :theme :mode)
124+
;; TODO: Support system mode.
125+
:dark :light
126+
:light :dark)]
127+
{:dispatch [:theme/set-mode mode]})))
128+
99129
(rf/reg-event-fx
100130
:pointer-event
101131
(fn [{:keys [db]} [_ {:keys [button buttons modifiers data-transfer pointer-pos delta element] :as e}]]
@@ -163,7 +193,7 @@
163193

164194
db)
165195
:fx [(when (= (:type e) :drop)
166-
[::drop [adjusted-pointer-pos data-transfer]])]})))
196+
[:drop [adjusted-pointer-pos data-transfer]])]})))
167197

168198
(rf/reg-event-db
169199
:keyboard-event
@@ -198,7 +228,7 @@
198228
(js/window.api.send "toMain" (clj->js data)))))
199229

200230
(rf/reg-fx
201-
::drop
231+
:drop
202232
(fn [[position data-transfer]]
203233
(drop/items! position (.-items data-transfer))
204234
(drop/files! position (.-files data-transfer))))
@@ -223,3 +253,8 @@
223253
:focus
224254
(fn [_ [_ id]]
225255
{:focus id}))
256+
257+
(rf/reg-fx
258+
:set-attribute
259+
(fn [[el attr val]]
260+
(.setAttribute el attr val)))

src/renderer/panel/core.cljs

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/renderer/panel/db.cljs

Lines changed: 0 additions & 5 deletions
This file was deleted.

src/renderer/panel/events.cljs

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/renderer/panel/subs.cljs

Lines changed: 0 additions & 8 deletions
This file was deleted.

src/renderer/subs.cljs

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,16 @@
142142
:grid?
143143
:-> :grid?)
144144

145+
(rf/reg-sub
146+
:panel/visible?
147+
(fn [db [_ key]]
148+
(-> db :panel key :visible?)))
149+
150+
(rf/reg-sub
151+
:theme/mode
152+
(fn [db _]
153+
(-> db :theme :mode)))
154+
145155
#_(rf/reg-sub
146156
:font-options
147157
:<- [:system-fonts]
File renamed without changes.

src/renderer/theme/core.cljs

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy