From 31eecb243ad4b73706527b8b66dacd8019a185cd Mon Sep 17 00:00:00 2001 From: Vomitblood Date: Tue, 30 Jul 2024 22:27:23 +0800 Subject: [PATCH] header bar window buttons --- bun.lockb | Bin 167318 -> 167827 bytes package.json | 1 + src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 6 +++ src/components/FooterBar.tsx | 0 src/components/HeaderBar.tsx | 19 ------- src/components/HeaderBar/HeaderBar.tsx | 25 +++++++++ src/components/HeaderBar/WindowButtons.tsx | 57 +++++++++++++++++++++ src/pages/index.tsx | 2 +- 9 files changed, 91 insertions(+), 21 deletions(-) create mode 100644 src/components/FooterBar.tsx delete mode 100644 src/components/HeaderBar.tsx create mode 100644 src/components/HeaderBar/HeaderBar.tsx create mode 100644 src/components/HeaderBar/WindowButtons.tsx diff --git a/bun.lockb b/bun.lockb index 635fb280f8a7f3c284d81b91ccb734dc013870e4..06bf92ce4af2783c56d037ddcc3ed81f0ce0f0fd 100755 GIT binary patch delta 30974 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 Z%rDp?|T-+o}C3Bamv*(wsi$n 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 delta 30567 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 diff --git a/package.json b/package.json index 92c4605..30be59f 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "@emotion/react": "^11.13.0", "@emotion/server": "^11.11.0", "@emotion/styled": "^11.13.0", + "@mui/icons-material": "^5.16.5", "@mui/material": "^5.16.5", "@tauri-apps/api": "^1.6.0", "next": "14.2.5", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 8a323a3..7e361e4 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -17,7 +17,7 @@ tauri-build = { version = "1.5.3", features = [] } [dependencies] serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.7.0", features = [ "notification-all", "dialog-all"] } +tauri = { version = "1.7.0", features = [ "window-all", "process-all", "notification-all", "dialog-all"] } [features] # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled. diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index fb6a5da..895e3c0 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -22,6 +22,12 @@ }, "notification": { "all": true + }, + "process": { + "all": true + }, + "window": { + "all": true } }, "bundle": { diff --git a/src/components/FooterBar.tsx b/src/components/FooterBar.tsx new file mode 100644 index 0000000..e69de29 diff --git a/src/components/HeaderBar.tsx b/src/components/HeaderBar.tsx deleted file mode 100644 index 2a83bab..0000000 --- a/src/components/HeaderBar.tsx +++ /dev/null @@ -1,19 +0,0 @@ -import { AppBar, Box, Toolbar } from "@mui/material"; - -export const HeaderBar = () => { - return ( - - - hello this is the left side - - hello this is the right side - - - ); -}; diff --git a/src/components/HeaderBar/HeaderBar.tsx b/src/components/HeaderBar/HeaderBar.tsx new file mode 100644 index 0000000..7c8f2c3 --- /dev/null +++ b/src/components/HeaderBar/HeaderBar.tsx @@ -0,0 +1,25 @@ +import { Box, Button, Typography } from "@mui/material"; +import { WindowButtons } from "./WindowButtons"; + +export const HeaderBar = () => { + const test = async () => { + console.log("hello"); + }; + + return ( + + hello this is the left side + + hello this is the right side | + + + + ); +}; diff --git a/src/components/HeaderBar/WindowButtons.tsx b/src/components/HeaderBar/WindowButtons.tsx new file mode 100644 index 0000000..ed5f9a7 --- /dev/null +++ b/src/components/HeaderBar/WindowButtons.tsx @@ -0,0 +1,57 @@ +import { Close, CloseFullscreen, Minimize } from "@mui/icons-material"; +import { Box, Button, ButtonGroup, Stack, useTheme } from "@mui/material"; +import { appWindow } from "@tauri-apps/api/window"; + +export const WindowButtons = () => { + const userTheme = useTheme(); + + const minimize = () => { + appWindow.minimize(); + }; + + const maximize = () => { + appWindow.toggleMaximize(); + }; + + const close = () => { + appWindow.close(); + }; + + return ( + + + + + + + + + + ); +}; diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 4c1ec15..2abcfc7 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -12,7 +12,7 @@ import { sendNotification, } from "@tauri-apps/api/notification"; import { useState } from "react"; -import { HeaderBar } from "../components/HeaderBar"; +import { HeaderBar } from "../components/HeaderBar/HeaderBar"; export default function Home() { const [content, setContent] = useState("Please enter your name");