Bläddra i källkod

fix linux env titlebar not showing

Weihua Lu 4 år sedan
förälder
incheckning
d98fb1ab5d
2 ändrade filer med 4 tillägg och 2 borttagningar
  1. 3 2
      src/electron/electron/core.cljs
  2. 1 0
      src/electron/electron/utils.cljs

+ 3 - 2
src/electron/electron/core.cljs

@@ -1,7 +1,7 @@
 (ns electron.core
   (:require [electron.handler :as handler]
             [electron.updater :refer [init-updater]]
-            [electron.utils :refer [mac? win32? prod? dev? logger open]]
+            [electron.utils :refer [mac? linux? win32? prod? dev? logger open]]
             [clojure.string :as string]
             ["fs" :as fs]
             ["path" :as path]
@@ -23,7 +23,7 @@
   []
   (let [win-opts {:width         980
                   :height        700
-                  :frame         win32?
+                  :frame         (or win32? linux?)
                   :autoHideMenuBar win32?
                   :titleBarStyle (if mac? "hidden" nil)
                   :webPreferences
@@ -34,6 +34,7 @@
                    :preload                 (path/join js/__dirname "js/preload.js")}}
         url MAIN_WINDOW_ENTRY
         win (BrowserWindow. (clj->js win-opts))]
+    (when linux?  (.removeMenu win))
     (.loadURL win url)
     (when dev? (.. win -webContents (openDevTools)))
     win))

+ 1 - 0
src/electron/electron/utils.cljs

@@ -2,6 +2,7 @@
 
 (defonce mac? (= (.-platform js/process) "darwin"))
 (defonce win32? (= (.-platform js/process) "win32"))
+(defonce linux? (= (.-platform js/process) "linux"))
 
 (defonce prod? (= js/process.env.NODE_ENV "production"))
 (defonce dev? (not prod?))