Browse Source

fix: don't show mobile toobar on PC

Tienson Qin 3 years ago
parent
commit
276bfc7aae
2 changed files with 9 additions and 4 deletions
  1. 2 1
      src/main/frontend/mobile/footer.cljs
  2. 7 3
      src/main/frontend/state.cljs

+ 2 - 1
src/main/frontend/mobile/footer.cljs

@@ -46,7 +46,8 @@
 
 (rum/defc footer < rum/reactive
   []
-  (when (and (state/sub :mobile/show-tabbar?)
+  (when (and (state/mobile?)
+             (state/sub :mobile/show-tabbar?)
              (state/get-current-repo))
     [:div.cp__footer.w-full.bottom-0.justify-between
      (audio-record-cp)

+ 7 - 3
src/main/frontend/state.cljs

@@ -58,7 +58,7 @@
      :modal/close-btn?                      nil
      :modal/subsets                         []
 
-     
+
      ;; right sidebar
      :ui/fullscreen?                        false
      :ui/settings-open?                     false
@@ -147,7 +147,7 @@
      :mobile/show-toolbar?                  false
      ;;; toolbar icon doesn't update correctly when clicking after separate it from box,
      ;;; add a random in (<= 1000000) to observer its update
-     :mobile/toolbar-update-observer        0 
+     :mobile/toolbar-update-observer        0
      :mobile/show-tabbar?                   false
 
      ;; plugin
@@ -1190,9 +1190,13 @@
     (set-state! :ui/shortcut-tooltip? (not mode))
     (storage/set :ui/shortcut-tooltip? (not mode))))
 
+(defn mobile?
+  []
+  (or (util/mobile?) (mobile-util/native-platform?)))
+
 (defn enable-tooltip?
   []
-  (if (or (util/mobile?) (mobile-util/native-platform?))
+  (if (mobile?)
     false
     (get (get (sub-config) (get-current-repo))
          :ui/enable-tooltip?