From 57a95b47596f9d7f55fb21b1f3d6d6b5b19bfe78 Mon Sep 17 00:00:00 2001 From: HorizonCode Date: Tue, 8 Jul 2025 09:20:43 +0200 Subject: [PATCH] remove: overlay, will be planned for future update tho --- README.md | 1 + src-tauri/src/commands.rs | 38 -------------------------------------- src-tauri/src/lib.rs | 14 ++++++-------- src-tauri/tauri.conf.json | 2 +- src/routes/+layout.svelte | 2 +- 5 files changed, 9 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index 6681b23..dc4f098 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,7 @@ It enhances the osu! experience with quality-of-life features and integration sp - [x] Shows the number of imported skins - [x] Displays ping to the EZPPFarm server - [ ] Discord Rich Presence (planned and in development) +- [ ] Performance Display Overlay (planned) --- diff --git a/src-tauri/src/commands.rs b/src-tauri/src/commands.rs index d629a6c..1df47a7 100644 --- a/src-tauri/src/commands.rs +++ b/src-tauri/src/commands.rs @@ -6,7 +6,6 @@ use std::path::PathBuf; use sysinfo::System; use tauri::AppHandle; use tauri::Emitter; -use tauri::Manager; use tokio::fs; use tokio::io::AsyncWriteExt; use tokio::process::Command; @@ -641,43 +640,6 @@ pub fn get_platform() -> String { std::env::consts::OS.to_string() } -#[tauri::command] -pub fn show_overlay(app: tauri::AppHandle) -> Result<(), String> { - if !app.webview_windows().contains_key("overlay") { - tauri::WebviewWindowBuilder::new( - &app, - "overlay", - tauri::WebviewUrl::App("/overlay".into()), - ) - .always_on_top(true) - .transparent(true) - .decorations(false) - .resizable(false) - .minimizable(false) - .fullscreen(true) - .skip_taskbar(true) - .visible(true) - .center() - .build() - .map_err(|e| e.to_string())?; - } else if let Some(overlay) = app.get_webview_window("overlay") { - overlay.show().map_err(|e| e.to_string())?; - } - - Ok(()) -} - -#[tauri::command] -pub fn hide_overlay(app: tauri::AppHandle) -> Result<(), String> { - if app.webview_windows().contains_key("overlay") - && let Some(overlay) = app.get_webview_window("overlay") - { - overlay.show().map_err(|e| e.to_string())?; - } - - Ok(()) -} - #[tauri::command] pub async fn check_for_corruption(folder: String) -> Result { let osu_path = PathBuf::from(folder); diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs index f91f96c..d79a8ef 100644 --- a/src-tauri/src/lib.rs +++ b/src-tauri/src/lib.rs @@ -4,11 +4,11 @@ use tauri::Manager; pub mod commands; pub mod utils; use crate::commands::{ - download_ezpp_launcher_update_files, exit, find_osu_installation, get_beatmapsets_count, - get_ezpp_launcher_update_files, get_hwid, get_launcher_version, get_osu_release_stream, - get_osu_skin, get_osu_version, get_skins_count, is_osu_running, open_url_in_browser, - replace_ui_files, run_osu, run_osu_updater, set_osu_config_values, set_osu_user_config_values, - valid_osu_folder, get_platform, check_for_corruption, show_overlay, hide_overlay + check_for_corruption, download_ezpp_launcher_update_files, exit, find_osu_installation, + get_beatmapsets_count, get_ezpp_launcher_update_files, get_hwid, get_launcher_version, + get_osu_release_stream, get_osu_skin, get_osu_version, get_platform, get_skins_count, + is_osu_running, open_url_in_browser, replace_ui_files, run_osu, run_osu_updater, + set_osu_config_values, set_osu_user_config_values, valid_osu_folder, }; #[cfg_attr(mobile, tauri::mobile_entry_point)] @@ -47,9 +47,7 @@ pub fn run() { get_launcher_version, exit, get_platform, - check_for_corruption, - show_overlay, - hide_overlay + check_for_corruption ]) .plugin(tauri_plugin_fs::init()) .plugin(tauri_plugin_dialog::init()) diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 4bfbbe6..2bb338d 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,7 +1,7 @@ { "$schema": "https://schema.tauri.app/config/2", "productName": "ezpplauncher", - "version": "3.0.0-beta.1", + "version": "3.0.0-beta.2", "identifier": "farm.ezpp.launcher", "build": { "beforeDevCommand": "bun run vite:dev", diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index c9d60db..04c98bd 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -19,10 +19,10 @@ import { Toaster } from '@/components/ui/sonner'; import { userAuth } from '@/userAuthentication'; import { exit, getLauncherVersion, getPlatform } from '@/osuUtil'; + import Button from '@/components/ui/button/button.svelte'; import '@fontsource/sora'; import '@fontsource/space-mono'; - import Button from '@/components/ui/button/button.svelte'; let { children } = $props();