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

fix imports for egui stuff

Browse Source
This commit is contained in:
Simon Gardling 2022-04-22 00:43:38 -04:00
parent fb0b076f62
commit 29c21bb601
6 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -2308,6 +2308,10 @@ dependencies = [
"console_error_panic_hook", "console_error_panic_hook",
"const_format", "const_format",
"eframe", "eframe",
"egui",
"emath",
"epaint",
"epi",
"exmex", "exmex",
"instant", "instant",
"itertools", "itertools",

5
Cargo.toml
View File

@ -29,6 +29,11 @@ strip = false
[dependencies] [dependencies]
eframe = { git = "https://github.com/Titaniumtown/egui.git", default-features = false } eframe = { git = "https://github.com/Titaniumtown/egui.git", default-features = false }
egui = { git = "https://github.com/Titaniumtown/egui.git", default-features = false }
epaint = { git = "https://github.com/Titaniumtown/egui.git", default-features = false }
epi = { git = "https://github.com/Titaniumtown/egui.git", default-features = false }
emath = { git = "https://github.com/Titaniumtown/egui.git", default-features = false }
shadow-rs = { version = "0.11.0", default-features = false } shadow-rs = { version = "0.11.0", default-features = false }
const_format = { version = "0.2.22", default-features = false, features = [ const_format = { version = "0.2.22", default-features = false, features = [
"fmt", "fmt",

2
src/consts.rs
View File

@ -2,7 +2,7 @@ use crate::function_entry::Riemann;
use std::ops::RangeInclusive; use std::ops::RangeInclusive;
use const_format::formatc; use const_format::formatc;
use eframe::epaint::Color32; use epaint::Color32;
use shadow_rs::shadow; use shadow_rs::shadow;
shadow!(build); shadow!(build);

1
src/function_entry.rs
View File

@ -5,7 +5,6 @@ use crate::function_handling::suggestions::Hint;
use crate::math_app::AppSettings; use crate::math_app::AppSettings;
use crate::misc::*; use crate::misc::*;
use crate::widgets::{widgets_ontop, AutoComplete, Movement}; use crate::widgets::{widgets_ontop, AutoComplete, Movement};
use eframe::{egui, emath, epaint};
use egui::{ use egui::{
plot::{BarChart, PlotUi, Value}, plot::{BarChart, PlotUi, Value},
widgets::plot::Bar, widgets::plot::Bar,

1
src/math_app.rs
View File

@ -1,7 +1,6 @@
use crate::consts::*; use crate::consts::*;
use crate::function_entry::{FunctionEntry, Riemann, DEFAULT_FUNCTION_ENTRY}; use crate::function_entry::{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, emath, epi};
use egui::{ use egui::{
plot::Plot, vec2, 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,

2
src/widgets.rs
View File

@ -1,6 +1,4 @@
use crate::function_handling::suggestions::{self, generate_hint, Hint}; use crate::function_handling::suggestions::{self, generate_hint, Hint};
use eframe::{egui, epaint};
use egui::{text::CCursor, text_edit::CursorRange, TextEdit}; use egui::{text::CCursor, text_edit::CursorRange, TextEdit};
use epaint::text::cursor::{Cursor, PCursor, RCursor}; use epaint::text::cursor::{Cursor, PCursor, RCursor};