Hide window frame and move header down for Win32

logseq · May 16, 2023 · 978ea0f · 978ea0f
1 parent f8cc599
commit 978ea0f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/resources/css/common.css b/resources/css/common.css
@@ -19,6 +19,7 @@
   --ls-warning-color: var(--color-orange-500);
   --ls-success-color: var(--color-green-500);
   --ls-highlight-color-default: var(--ls-secondary-background-color);
+  --ls-win32-title-bar-height: 0px;
 }
 
 @media (prefers-color-scheme: dark) {

diff --git a/src/electron/electron/window.cljs b/src/electron/electron/window.cljs
@@ -29,7 +29,7 @@
          win-opts  (cond->
                      {:width                (.-width win-state)
                       :height               (.-height win-state)
-                      :frame                true
+                      :frame                (not win32?)
                       :titleBarStyle        "hiddenInset"
                       :trafficLightPosition {:x 16 :y 16}
                       :autoHideMenuBar      (not mac?)

diff --git a/src/main/frontend/components/header.css b/src/main/frontend/components/header.css
@@ -1,8 +1,9 @@
 .cp__header {
-  @apply z-10;
-
-  padding-top: var(--ls-headbar-inner-top-padding);
-  height: calc(var(--ls-headbar-height) + var(--ls-headbar-inner-top-padding));
+  @apply shadow z-10;
+  -webkit-app-region: drag;
+
+  padding-top: calc(var(--ls-headbar-inner-top-padding) + var(--ls-win32-title-bar-height));
+  height: calc(var(--ls-headbar-height) + var(--ls-headbar-inner-top-padding) + var(--ls-win32-title-bar-height));
   display: flex;
   align-items: center;
   justify-content: space-between;

diff --git a/src/main/frontend/components/win32_title_bar.cljs b/src/main/frontend/components/win32_title_bar.cljs
@@ -0,0 +1,8 @@
+(ns frontend.components.win32-title-bar
+  (:require [rum.core :as rum]))
+
+(rum/defc container
+  []
+  [:p
+    {}
+    ["Hello, World!"]])
diff --git a/src/main/frontend/components/win32_title_bar.css b/src/main/frontend/components/win32_title_bar.css
@@ -0,0 +1,3 @@
+.is-win32.is-electron {
+  --ls-win32-title-bar-height: 30px;
+}