update egui

This commit is contained in:
Simon Gardling
2023-10-02 09:21:56 -04:00
parent 346c9ee267
commit c486c554c8
9 changed files with 166 additions and 187 deletions

View File

@@ -1,10 +1,8 @@
use crate::math_app::AppSettings;
use crate::misc::{newtons_method_helper, step_helper, EguiHelper};
use egui::{
plot::{BarChart, PlotPoint, PlotUi},
widgets::plot::Bar,
Checkbox, Context,
};
use egui::{Checkbox, Context};
use egui_plot::{Bar, BarChart, PlotPoint, PlotUi};
use epaint::Color32;
use parsing::{generate_hint, AutoComplete};
use parsing::{process_func_str, BackingFunction};

View File

@@ -69,7 +69,9 @@ impl<'de> Deserialize<'de> for FunctionManager {
}
/// Function that creates button that's used with the `button_area`
fn button_area_button(text: impl Into<WidgetText>) -> Button { Button::new(text).frame(false) }
fn button_area_button<'a>(text: impl Into<WidgetText>) -> Button<'a> {
Button::new(text).frame(false)
}
impl FunctionManager {
#[inline]

View File

@@ -25,13 +25,8 @@ pub use crate::{
function_entry::{FunctionEntry, Riemann},
math_app::AppSettings,
misc::{
hashed_storage_create,
hashed_storage_read,
newtons_method,
option_vec_printer,
step_helper,
EguiHelper,
HashBytes,
hashed_storage_create, hashed_storage_read, newtons_method, option_vec_printer,
step_helper, EguiHelper, HashBytes,
},
unicode_helper::{to_chars_array, to_unicode_hash},
};

View File

@@ -6,9 +6,11 @@ use crate::{
};
use eframe::App;
use egui::{
plot::Plot, style::Margin, Button, CentralPanel, Color32, ComboBox, Context, DragValue, Frame,
Key, Layout, SidePanel, TopBottomPanel, Ui, Vec2, Window,
style::Margin, Button, CentralPanel, Color32, ComboBox, Context, DragValue, Frame, Key, Layout,
SidePanel, TopBottomPanel, Ui, Vec2, Window,
};
use egui_plot::Plot;
use emath::{Align, Align2};
use epaint::Rounding;
use instant::Instant;

View File

@@ -1,5 +1,5 @@
use egui::plot::{Line, PlotPoint, PlotPoints, Points};
use egui::Id;
use egui_plot::{Line, PlotPoint, PlotPoints, Points};
use emath::Pos2;
use getrandom::getrandom;
use itertools::Itertools;