Skip to content

Commit 0890c5f

Browse files
committed
move status text
1 parent bcf761f commit 0890c5f

File tree

3 files changed

+13
-12
lines changed

3 files changed

+13
-12
lines changed

src/renderer/color/views.cljs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
[]
3333
(let [fill @(rf/subscribe [:document/fill])
3434
stroke @(rf/subscribe [:document/stroke])]
35-
[:<>
35+
[:div.grow.flex
3636
[:> Popover/Root {:modal true}
3737
[:> Popover/Trigger {:as-child true}
3838
[:button.button.color-rect.relative {:style {:background stroke}}

src/renderer/toolbar/status.cljs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -99,18 +99,10 @@
9999

100100
(defn root []
101101
(let [zoom @(rf/subscribe [:document/zoom])
102-
timeline? @(rf/subscribe [:panel/visible? :timeline])
103-
loading? @(rf/subscribe [:worker/loading?])]
102+
timeline? @(rf/subscribe [:panel/visible? :timeline])]
104103
[:<>
105104
[:div.toolbar.bg-primary.mt-px
106105
[color-v/picker]
107-
[:div.grow.text-xs.truncate.mx-1
108-
@(rf/subscribe [:message])]
109-
(when loading?
110-
[:<>
111-
[:span.icon-button.relative
112-
[comp/icon "spinner" {:class "loading"}]]
113-
[:span.v-divider]])
114106
(into [:<>]
115107
(map (fn [{:keys [title active? icon action]}]
116108
[comp/radio-icon-button {:title title

src/renderer/views.cljs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
[re-frame.registrar]
77
[renderer.attribute.views :as attr]
88
[renderer.codemirror.views :as cm]
9-
#_[renderer.components :as comp]
9+
[renderer.components :as comp]
1010
[renderer.debug :as debug]
1111
[renderer.dialog.views :as dialog]
1212
[renderer.document.views :as doc]
@@ -25,7 +25,8 @@
2525
(defn frame-panel
2626
[]
2727
(let [rulers? @(rf/subscribe [:rulers?])
28-
read-only? @(rf/subscribe [:document/read-only?])]
28+
read-only? @(rf/subscribe [:document/read-only?])
29+
loading? @(rf/subscribe [:worker/loading?])]
2930
[:div.flex.flex-col.flex-1.h-full
3031
[:div.mb-px [toolbar.tools/root]
3132
(when rulers?
@@ -54,6 +55,14 @@
5455
[:<>
5556
[debug/info]
5657
[debug/fps]]))
58+
[:div.absolute.bottom-0.left-0.flex.pointer-events-none.w-full.p-2
59+
{:style {:color "#555"}}
60+
[:div.grow.text-xs.truncate.flex.items-end
61+
@(rf/subscribe [:message])]
62+
(when loading?
63+
[:span.icon-button.relative
64+
{:style {:fill "#555"}}
65+
[comp/icon "spinner" {:class "loading"}]])]
5766
(when @(rf/subscribe [:backdrop?])
5867
[:div.absolute.inset-0
5968
{:on-click #(rf/dispatch [:set-backdrop false])}])]]]))

0 commit comments

Comments
 (0)