Merge pull request #128 from pacholoamit/master

master
pacholoamit · May 16, 2024 · 1665926 · 1665926
2 parents 4b58e2d + 5fbbe7e
commit 1665926
Show file tree

Hide file tree

Showing 11 changed files with 623 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](https://semver.org/).
 
+## 0.7.2
+- Implement custom title bars
+
 ## 0.7.1
 - Change Chart height
 - Improve font style

diff --git a/index.html b/index.html
@@ -121,6 +121,10 @@
       }
     </style>
     <!-- LOAD GOOGLE FONTS END -->
+
+    <!-- CUSTOM TITLE BAR START -->
+
+    <!-- CUSTOM TITLE BAR END -->
     <title>Pachtop</title>
   </head>
   <body>

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "pachtop",
   "private": true,
-  "version": "0.7.1",
+  "version": "0.7.2",
   "type": "module",
   "scripts": {
     "dev": "vite",

diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "app"
-version = "0.7.1"
+version = "0.7.2"
 description = "Cross-platform (Linux, WIndows, MacOS) Desktop GUI system monitor"
 authors = ["Pacholo Amit"]
 license = "MIT"
@@ -19,14 +19,28 @@ chrono = {version = "0.4.23", features= ["serde"] }
 # rusqlite = { version = "0.28.0", features = ["bundled", "chrono"] }
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "1.6.5", features = ["api-all", "system-tray", "updater"] }
+tauri = { version = "1.6.5", features = ["api-all", "system-tray", "updater",   "window-start-dragging"] }
 sysinfo = "0.29.11"
 tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
+tauri-plugin-window-state = "0.1.0"
 log = "^0.4"
 tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread"] }
 ts-rs = "8.1"
+hex_color = "3.0.0"
+
+[target.'cfg(target_os = "macos")'.dependencies]
+cocoa = "0.25.0"
+objc = "0.2.7"
+
+[target.'cfg(target_os = "windows")'.dependencies]
+windows = { version = "0.52.0", features = [
+  "Win32_Graphics_Dwm",
+  "Win32_Foundation",
+  "Win32_UI_Controls",
+] }
+winver = "1"
 # surrealdb = { version = "1.5.0" }
 
 

diff --git a/src-tauri/src/mac/mod.rs b/src-tauri/src/mac/mod.rs
@@ -0,0 +1 @@
+pub mod window;