diff --git a/gpgui/index.html b/gpgui/index.html index e0d1c84..3901673 100644 --- a/gpgui/index.html +++ b/gpgui/index.html @@ -3,10 +3,15 @@ - + Vite + React + TS - + +
diff --git a/gpgui/src-tauri/src/main.rs b/gpgui/src-tauri/src/main.rs index 8c1bde2..2ecf081 100644 --- a/gpgui/src-tauri/src/main.rs +++ b/gpgui/src-tauri/src/main.rs @@ -44,6 +44,18 @@ fn setup(app: &mut tauri::App) -> Result<(), Box> { }); app.manage(client); + + match std::env::var("XDG_CURRENT_DESKTOP") { + Ok(desktop) => { + if desktop == "KDE" { + if let Some(main_window) = app.get_window("main") { + let _ = main_window.set_decorations(false); + } + } + } + Err(_) => (), + } + Ok(()) } diff --git a/gpgui/src-tauri/tauri.conf.json b/gpgui/src-tauri/tauri.conf.json index 7c97240..ebb5e68 100644 --- a/gpgui/src-tauri/tauri.conf.json +++ b/gpgui/src-tauri/tauri.conf.json @@ -68,11 +68,13 @@ }, "windows": [ { + "title": "GlobalProtect", + "label": "main", "fullscreen": false, + "width": 260, "height": 360, "resizable": false, - "title": "GlobalProtect", - "width": 260 + "fileDropEnabled": false } ] } diff --git a/gpgui/src/App.tsx b/gpgui/src/App.tsx index 4ddc360..5545ead 100644 --- a/gpgui/src/App.tsx +++ b/gpgui/src/App.tsx @@ -41,7 +41,7 @@ export default function App() { const ready = useAtomValue(statusReadyAtom); return ( - + {ready ? : } diff --git a/gpgui/src/components/ConnectionStatus/StatusIcon.tsx b/gpgui/src/components/ConnectionStatus/StatusIcon.tsx index cb761c0..f7a3a9d 100644 --- a/gpgui/src/components/ConnectionStatus/StatusIcon.tsx +++ b/gpgui/src/components/ConnectionStatus/StatusIcon.tsx @@ -93,11 +93,17 @@ function InnerStatusIcon() { return ; } +const DragRegion = styled(Box)(({ theme }) => ({ + position: "absolute", + inset: 0, +})); + export default function StatusIcon() { return ( + ); } diff --git a/gpgui/src/components/ConnectionStatus/StatusText.tsx b/gpgui/src/components/ConnectionStatus/StatusText.tsx index d2e06dd..3382724 100644 --- a/gpgui/src/components/ConnectionStatus/StatusText.tsx +++ b/gpgui/src/components/ConnectionStatus/StatusText.tsx @@ -7,6 +7,7 @@ export default function StatusText() { return ( + diff --git a/gpgui/src/components/Notification/index.tsx b/gpgui/src/components/Notification/index.tsx index dab28e7..32e7c57 100644 --- a/gpgui/src/components/Notification/index.tsx +++ b/gpgui/src/components/Notification/index.tsx @@ -1,4 +1,4 @@ -import { Alert, AlertTitle, Slide, SlideProps, Snackbar } from "@mui/material"; +import { Alert, AlertTitle, Box, Slide, SlideProps, Snackbar } from "@mui/material"; import { useAtom, useAtomValue } from "jotai"; import { closeNotificationAtom, @@ -35,6 +35,7 @@ export default function Notification() { }} > - {title && {title}} - {message} + {title && {title}} + {message && {message}} );