From e400111f8ae758f781f73d8b49c99f12ba3ddfc5 Mon Sep 17 00:00:00 2001
From: MystiPanda <mystipanda@proton.me>
Date: Sun, 26 May 2024 21:57:47 +0800
Subject: [PATCH] Release 1.6.4

---
 UPDATELOG.md                             | 2 +-
 package.json                             | 2 +-
 src-tauri/Cargo.lock                     | 2 +-
 src-tauri/Cargo.toml                     | 4 ++--
 src-tauri/tauri.conf.json                | 2 +-
 src/components/layout/layout-control.tsx | 1 +
 src/components/profile/editor-viewer.tsx | 2 +-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/UPDATELOG.md b/UPDATELOG.md
index 84ced978..76b524e6 100644
--- a/UPDATELOG.md
+++ b/UPDATELOG.md
@@ -1,4 +1,4 @@
-## v1.6.3
+## v1.6.4
 
 ### Features
 
diff --git a/package.json b/package.json
index 353b66b6..1b21fe19 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "clash-verge",
-  "version": "1.6.3",
+  "version": "1.6.4",
   "license": "GPL-3.0-only",
   "scripts": {
     "dev": "tauri dev",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 176ab4c1..50433c12 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -788,7 +788,7 @@ dependencies = [
 
 [[package]]
 name = "clash-verge"
-version = "1.6.3"
+version = "1.6.4"
 dependencies = [
  "anyhow",
  "auto-launch",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 7b30b696..7a916502 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "clash-verge"
-version = "1.6.3"
+version = "1.6.4"
 description = "clash verge"
 authors = ["zzzgydi", "wonfen", "MystiPanda"]
 license = "GPL-3.0-only"
@@ -37,7 +37,7 @@ serde = { version = "1.0", features = ["derive"] }
 reqwest = { version = "0.12", features = ["json", "rustls-tls"] }
 sysproxy = { git="https://github.com/zzzgydi/sysproxy-rs", branch = "main" }
 auto-launch = { git="https://github.com/zzzgydi/auto-launch", branch = "main" }
-tauri = { version = "1.6", features = [ "http-all", "fs-read-file", "fs-exists", "path-all", "protocol-asset", "dialog-open", "notification-all", "icon-png", "icon-ico", "clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all", "devtools"] }
+tauri = { version = "1.6", features = [ "fs-read-file", "fs-exists", "path-all", "protocol-asset", "dialog-open", "notification-all", "icon-png", "icon-ico", "clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all", "devtools"] }
 
 [target.'cfg(windows)'.dependencies]
 runas = "=1.2.0"
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 982179dc..3b909b7b 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -2,7 +2,7 @@
   "$schema": "../node_modules/@tauri-apps/cli/schema.json",
   "package": {
     "productName": "Clash Verge",
-    "version": "1.6.3"
+    "version": "1.6.4"
   },
   "build": {
     "distDir": "../dist",
diff --git a/src/components/layout/layout-control.tsx b/src/components/layout/layout-control.tsx
index ad72693b..6a69051a 100644
--- a/src/components/layout/layout-control.tsx
+++ b/src/components/layout/layout-control.tsx
@@ -36,6 +36,7 @@ export const LayoutControl = () => {
     <ButtonGroup
       variant="text"
       sx={{
+        zIndex: 1000,
         height: "100%",
         ".MuiButtonGroup-grouped": {
           borderRadius: "0px",
diff --git a/src/components/profile/editor-viewer.tsx b/src/components/profile/editor-viewer.tsx
index 903358d0..d8982302 100644
--- a/src/components/profile/editor-viewer.tsx
+++ b/src/components/profile/editor-viewer.tsx
@@ -131,7 +131,7 @@ export const EditorViewer = (props: Props) => {
         padding: {
           top: 33, // 顶部padding防止遮挡snippets
         },
-        fontFamily: `Fira Code, Roboto Mono, Roboto, Source Code Pro, Menlo, Monaco, Consolas, Courier New, monospace, "Apple Color Emoji"${
+        fontFamily: `Fira Code, JetBrains Mono, Roboto Mono, "Source Code Pro", Consolas, Menlo, Monaco, monospace, "Courier New", "Apple Color Emoji"${
           getSystem() === "windows" ? ", twemoji mozilla" : ""
         }`,
         fontLigatures: true, // 连字符