futile/gta-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

reintroduce ScrollArea to CentralPanel and increase WINDOW_SIZE to accommodate

Browse Source
This commit is contained in:
futile
2025-04-10 16:52:20 +01:00
parent d182ca5318
commit c6cd0cf2f9
1 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/mod.rs
+17 -13
View File
@@ -15,7 +15,7 @@ use crate::{
use eframe::egui; use eframe::egui;
use std::time::{Duration, Instant}; use std::time::{Duration, Instant};
const WINDOW_SIZE: [f32; 2] = [240.0, 240.0]; const WINDOW_SIZE: [f32; 2] = [240.0, 245.0];
#[derive(Debug, Default, PartialEq, Eq)] #[derive(Debug, Default, PartialEq, Eq)]
pub enum Stage { pub enum Stage {
@@ -97,17 +97,21 @@ impl eframe::App for App {
}); });
}); });
}); });
egui::CentralPanel::default().show(ctx, |ui| match self.stage { egui::CentralPanel::default().show(ctx, |ui| {
Stage::Main => { egui::ScrollArea::vertical()
self.header(ui, "Game"); .auto_shrink([false, true])
self.show_game(ctx, ui); .show(ui, |ui| match self.stage {
self.header(ui, "Session"); Stage::Main => {
self.show_session(ctx, ui); self.header(ui, "Game");
self.header(ui, "Network"); self.show_game(ctx, ui);
self.show_network(ctx, ui); self.header(ui, "Session");
} self.show_session(ctx, ui);
Stage::Settings => self.show_settings(ctx, ui), self.header(ui, "Network");
Stage::About => self.show_about(ctx, ui), self.show_network(ctx, ui);
}
Stage::Settings => self.show_settings(ctx, ui),
Stage::About => self.show_about(ctx, ui),
});
}); });
if check_debug_keycombo_pressed(ctx) { if check_debug_keycombo_pressed(ctx) {
self.flags.debug = !self.flags.debug; self.flags.debug = !self.flags.debug;
@@ -138,7 +142,7 @@ impl eframe::App for App {
} }
egui::CentralPanel::default().show(ctx, |ui| { egui::CentralPanel::default().show(ctx, |ui| {
egui::ScrollArea::both() egui::ScrollArea::both()
.auto_shrink([false, false]) .auto_shrink([false, true])
.show(ui, |ui| { .show(ui, |ui| {
self.show_debug(ctx, ui); self.show_debug(ctx, ui);
}); });