reintroduce ScrollArea to CentralPanel and increase WINDOW_SIZE to accommodate
This commit is contained in:
+7
-3
@@ -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,7 +97,10 @@ impl eframe::App for App {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
egui::CentralPanel::default().show(ctx, |ui| match self.stage {
|
egui::CentralPanel::default().show(ctx, |ui| {
|
||||||
|
egui::ScrollArea::vertical()
|
||||||
|
.auto_shrink([false, true])
|
||||||
|
.show(ui, |ui| match self.stage {
|
||||||
Stage::Main => {
|
Stage::Main => {
|
||||||
self.header(ui, "Game");
|
self.header(ui, "Game");
|
||||||
self.show_game(ctx, ui);
|
self.show_game(ctx, ui);
|
||||||
@@ -109,6 +112,7 @@ impl eframe::App for App {
|
|||||||
Stage::Settings => self.show_settings(ctx, ui),
|
Stage::Settings => self.show_settings(ctx, ui),
|
||||||
Stage::About => self.show_about(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);
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user