From 03ca861a0991e05aefa11d735976031a6cd52d8c Mon Sep 17 00:00:00 2001 From: futile Date: Tue, 8 Apr 2025 15:45:18 +0100 Subject: [PATCH] change ui window size + ui spacing size & make an enum Copy --- src/features/launch.rs | 2 +- src/gui.rs | 32 +++++++++++++------------------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/features/launch.rs b/src/features/launch.rs index af26883..8ee4fa6 100644 --- a/src/features/launch.rs +++ b/src/features/launch.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use std::{fmt::Display, path::PathBuf, process::Command}; use winreg::{RegKey, enums::HKEY_LOCAL_MACHINE}; -#[derive(Clone, Default, Debug, PartialEq, Eq, Serialize, Deserialize)] +#[derive(Clone, Copy, Default, Debug, PartialEq, Eq, Serialize, Deserialize)] pub enum Platform { #[default] Steam, diff --git a/src/gui.rs b/src/gui.rs index bb58734..fc28c64 100644 --- a/src/gui.rs +++ b/src/gui.rs @@ -24,7 +24,7 @@ use sysinfo::System; use windows::Win32::Foundation::HANDLE; const THEME: catppuccin_egui::Theme = catppuccin_egui::MOCHA; -const WINDOW_SIZE: [f32; 2] = [267.0, 237.0]; +const WINDOW_SIZE: [f32; 2] = [240.0, 240.0]; static CONFIG_PATH: LazyLock = LazyLock::new(|| { let mut config_path = dirs::config_local_dir().unwrap(); config_path.push("GTA Tools"); @@ -90,7 +90,7 @@ impl eframe::App for App { self.launch.selected = persistent_state.launcher; } } - ctx.style_mut(|style| style.spacing.item_spacing = egui::vec2(3.0, 3.0)); + ctx.style_mut(|style| style.spacing.item_spacing = egui::vec2(4.0, 4.0)); self.initialized = true; } self.run_timers(); @@ -111,22 +111,16 @@ impl eframe::App for App { }); }); }); - egui::CentralPanel::default().show(ctx, |ui| { - egui::ScrollArea::both() - .auto_shrink([false, false]) - .show(ui, |ui| match self.stage { - Stage::Main => { - self.header(ui, "Game"); - self.show_game(ctx, ui); - self.header(ui, "Session"); - self.show_session(ctx, ui); - self.header(ui, "Network"); - self.show_network(ctx, ui); - } - Stage::About => { - self.show_about(ctx, ui); - } - }); + egui::CentralPanel::default().show(ctx, |ui| match self.stage { + Stage::Main => { + self.header(ui, "Game"); + self.show_game(ctx, ui); + self.header(ui, "Session"); + self.show_session(ctx, ui); + self.header(ui, "Network"); + self.show_network(ctx, ui); + } + Stage::About => self.show_about(ctx, ui), }); if self.check_debug_keycombo_pressed(ctx) { self.debug = !self.debug; @@ -347,7 +341,7 @@ impl Drop for App { fn drop(&mut self) { // save any persistent state to config file let persistent_state = PersistentState { - launcher: self.launch.selected.clone(), + launcher: self.launch.selected, }; let config_path = CONFIG_PATH.as_path(); let config_path_parent = config_path.parent().unwrap();