Merge branch 'Tohrusky:main' into main

Tohrusky · Jun 30, 2023 · 5fda248 · 5fda248
2 parents 2e27e8f + 04a91f7
commit 5fda248
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/src/main/index.ts b/src/main/index.ts
@@ -17,8 +17,9 @@ function createWindow(): void {
     minWidth: 670,
     maxHeight: 670,
     minHeight: 470,
-    frame: process.platform !== 'darwin',
-    titleBarStyle: 'hiddenInset',
+    // frame: process.platform !== 'darwin',
+    // titleBarStyle: 'hiddenInset',
+    frame: true,
     show: false,
     autoHideMenuBar: true,
     icon: nativeImage.createFromPath(icon),

diff --git a/src/renderer/src/App.vue b/src/renderer/src/App.vue
@@ -68,7 +68,7 @@ const themeOverrides = {
   <n-config-provider :theme="getTheme" :theme-overrides="themeOverrides">
     <n-notification-provider class="n-config-provider" placement="top">
       <n-dialog-provider>
-        <div class="drag" />
+        <!--        <div class="drag" />-->
         <div class="background">
           <MyProgress />
           <div class="view">
@@ -129,13 +129,13 @@ $buttom-bottom: 8px;
   }
 }
 
-.drag {
-  width: 100%;
-  height: 30px;
-  position: fixed;
-  background-color: $global-color;
-  -webkit-app-region: drag;
-}
+//.drag {
+//  width: 100%;
+//  height: 30px;
+//  position: fixed;
+//  background-color: $global-color;
+//  -webkit-app-region: drag;
+//}
 
 .fade-enter-active {
   transition: opacity 0.6s ease-in-out;