titaniumtown/YTBN-Graphing-Software
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anchor welcome window

Browse Source
This commit is contained in:
Simon Gardling 2022-04-04 13:41:48 -04:00
parent b71e660145
commit 94cfae4acc
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/math_app.rs
View File

@ -1,11 +1,12 @@
use crate::consts::*; use crate::consts::*;
use crate::function::{FunctionEntry, Riemann, DEFAULT_FUNCTION_ENTRY}; use crate::function::{FunctionEntry, Riemann, DEFAULT_FUNCTION_ENTRY};
use crate::misc::{dyn_mut_iter, option_vec_printer, JsonFileOutput, SerdeValueHelper}; use crate::misc::{dyn_mut_iter, option_vec_printer, JsonFileOutput, SerdeValueHelper};
use eframe::{egui, epi}; use eframe::{egui, emath, epi};
use egui::{ use egui::{
plot::Plot, Button, CentralPanel, Color32, ComboBox, Context, FontData, FontDefinitions, plot::Plot, vec2, Button, CentralPanel, Color32, ComboBox, Context, FontData, FontDefinitions,
FontFamily, Key, RichText, SidePanel, Slider, TopBottomPanel, Vec2, Visuals, Window, FontFamily, Key, RichText, SidePanel, Slider, TopBottomPanel, Vec2, Visuals, Window,
}; };
use emath::Align2;
use instant::Duration; use instant::Duration;
use std::collections::BTreeMap; use std::collections::BTreeMap;
use std::{io::Read, ops::BitXorAssign, str}; use std::{io::Read, ops::BitXorAssign, str};
@ -565,8 +566,6 @@ impl epi::App for MathApp {
false => Visuals::light(), false => Visuals::light(),
}); });
let center_pos = ctx.available_rect().center();
// if text boxes aren't in focus, allow H keybind to toggle side panel. // if text boxes aren't in focus, allow H keybind to toggle side panel.
// this is behind this check as if it wasn't, it would trigger if the user // this is behind this check as if it wasn't, it would trigger if the user
// presses the h key in a text box as well // presses the h key in a text box as well
@ -647,8 +646,8 @@ impl epi::App for MathApp {
// Help window with information for users // Help window with information for users
Window::new("Help") Window::new("Help")
.default_pos([200.0, 200.0])
.open(&mut self.opened.help) .open(&mut self.opened.help)
.default_pos([200.0, 200.0])
.resizable(false) .resizable(false)
.collapsible(false) .collapsible(false)
.show(ctx, |ui| { .show(ctx, |ui| {
@ -677,8 +676,8 @@ impl epi::App for MathApp {
// Welcome window // Welcome window
Window::new("Welcome!") Window::new("Welcome!")
.default_pos(center_pos)
.open(&mut self.opened.welcome) .open(&mut self.opened.welcome)
.anchor(Align2::CENTER_CENTER, vec2(0.0, 0.0))
.resizable(false) .resizable(false)
.collapsible(false) .collapsible(false)
.show(ctx, |ui| { .show(ctx, |ui| {
@ -687,8 +686,8 @@ impl epi::App for MathApp {
// Window with information about the build and current commit // Window with information about the build and current commit
Window::new("Info") Window::new("Info")
.default_pos([200.0, 200.0])
.open(&mut self.opened.info) .open(&mut self.opened.info)
.default_pos([200.0, 200.0])
.resizable(false) .resizable(false)
.collapsible(false) .collapsible(false)
.show(ctx, |ui| { .show(ctx, |ui| {