Browse Source

improve(electron): polish UI on Linux

charlie 4 years ago
parent
commit
374af200cf
2 changed files with 8 additions and 4 deletions
  1. 3 2
      src/electron/electron/core.cljs
  2. 5 2
      src/main/frontend/components/theme.css

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

@@ -21,7 +21,7 @@
   []
   (let [win-opts {:width         980
                   :height        700
-                  :frame         win32?
+                  :frame         (not mac?)
                   :titleBarStyle (if mac? "hidden" nil)
                   :webPreferences
                   {:nodeIntegration         false
@@ -30,6 +30,7 @@
                    :preload                 (path/join js/__dirname "js/preload.js")}}
         url MAIN_WINDOW_ENTRY
         win (BrowserWindow. (clj->js win-opts))]
+    (when-not mac? (.removeMenu win))
     (.loadURL win url)
     (when dev? (.. win -webContents (openDevTools)))
     win))
@@ -103,7 +104,7 @@
            (@*setup-fn)
 
            ;; main window events
-           (.on win "close" #(if (or @*quitting? win32?)
+           (.on win "close" #(if (or @*quitting? (not mac?))
                                (reset! *win nil)
                                (do (.preventDefault ^js/Event %)
                                    (.hide win))))

+ 5 - 2
src/main/frontend/components/theme.css

@@ -99,8 +99,7 @@ html.is-electron {
   }
 
   .cp__header {
-    height: 2rem;
-    padding-top: var(--frame-top-height);
+    height: 2.6rem;
     background-color: var(--ls-primary-background-color);
     top: 0;
   }
@@ -133,6 +132,10 @@ html.is-electron {
 
   #search {
     -webkit-app-region: drag;
+
+    #search-wrapper {
+      -webkit-app-region: no-drag;
+    }
   }
 
   .ls-window-frame-title-bar {