From 29c21bb601e9553d1e2bd0f6f2e15495d474f704 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@gmail.com>
Date: Fri, 22 Apr 2022 00:43:38 -0400
Subject: [PATCH] fix imports for egui stuff

---
 Cargo.lock            | 4 ++++
 Cargo.toml            | 5 +++++
 src/consts.rs         | 2 +-
 src/function_entry.rs | 1 -
 src/math_app.rs       | 1 -
 src/widgets.rs        | 2 --
 6 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ba3b1ce..a2605fb 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2308,6 +2308,10 @@ dependencies = [
  "console_error_panic_hook",
  "const_format",
  "eframe",
+ "egui",
+ "emath",
+ "epaint",
+ "epi",
  "exmex",
  "instant",
  "itertools",
diff --git a/Cargo.toml b/Cargo.toml
index a442983..8a42680 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -29,6 +29,11 @@ strip = false
 
 [dependencies]
 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 }
 const_format = { version = "0.2.22", default-features = false, features = [
     "fmt",
diff --git a/src/consts.rs b/src/consts.rs
index ee70715..f7ae7f6 100644
--- a/src/consts.rs
+++ b/src/consts.rs
@@ -2,7 +2,7 @@ use crate::function_entry::Riemann;
 use std::ops::RangeInclusive;
 
 use const_format::formatc;
-use eframe::epaint::Color32;
+use epaint::Color32;
 use shadow_rs::shadow;
 shadow!(build);
 
diff --git a/src/function_entry.rs b/src/function_entry.rs
index dc277bf..2c74146 100644
--- a/src/function_entry.rs
+++ b/src/function_entry.rs
@@ -5,7 +5,6 @@ use crate::function_handling::suggestions::Hint;
 use crate::math_app::AppSettings;
 use crate::misc::*;
 use crate::widgets::{widgets_ontop, AutoComplete, Movement};
-use eframe::{egui, emath, epaint};
 use egui::{
 	plot::{BarChart, PlotUi, Value},
 	widgets::plot::Bar,
diff --git a/src/math_app.rs b/src/math_app.rs
index 966487f..0d6340d 100644
--- a/src/math_app.rs
+++ b/src/math_app.rs
@@ -1,7 +1,6 @@
 use crate::consts::*;
 use crate::function_entry::{FunctionEntry, Riemann, DEFAULT_FUNCTION_ENTRY};
 use crate::misc::{dyn_mut_iter, option_vec_printer, JsonFileOutput, SerdeValueHelper};
-use eframe::{egui, emath, epi};
 use egui::{
 	plot::Plot, vec2, Button, CentralPanel, Color32, ComboBox, Context, FontData, FontDefinitions,
 	FontFamily, Key, RichText, SidePanel, Slider, TopBottomPanel, Vec2, Visuals, Window,
diff --git a/src/widgets.rs b/src/widgets.rs
index ce90199..e7615cc 100644
--- a/src/widgets.rs
+++ b/src/widgets.rs
@@ -1,6 +1,4 @@
 use crate::function_handling::suggestions::{self, generate_hint, Hint};
-
-use eframe::{egui, epaint};
 use egui::{text::CCursor, text_edit::CursorRange, TextEdit};
 use epaint::text::cursor::{Cursor, PCursor, RCursor};