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

simplify code

Browse Source
This commit is contained in:
Simon Gardling 2022-04-14 16:51:05 -04:00
parent 0b51f1f702
commit 00392d22b4
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/function.rs
View File

@ -75,8 +75,6 @@ pub struct FunctionEntry {
curr_nth: usize, curr_nth: usize,
pub settings_opened: bool, pub settings_opened: bool,
menu_opened: f32,
} }
impl Default for FunctionEntry { impl Default for FunctionEntry {
@ -100,7 +98,6 @@ impl Default for FunctionEntry {
test_result: None, test_result: None,
curr_nth: 3, curr_nth: 3,
settings_opened: false, settings_opened: false,
menu_opened: 1.0,
} }
} }
} }
@ -121,14 +118,15 @@ impl FunctionEntry {
.fonts() .fonts()
.row_height(&egui::FontSelection::default().resolve(ui.style())); .row_height(&egui::FontSelection::default().resolve(ui.style()));
let max_size = vec2( let max_size = vec2(ui.available_width(), {
ui.available_width(), let had_focus = ui.ctx().memory().has_focus(te_id);
if self.menu_opened == 1.0 { let gotten_value = ui.ctx().animate_bool(te_id, had_focus);
if gotten_value == 1.0 {
row_height * 2.5 row_height * 2.5
} else { } else {
row_height * (1.0 + (self.menu_opened * 1.5)) row_height * (1.0 + (gotten_value * 1.5))
}, }
); });
let re = ui.add_sized( let re = ui.add_sized(
max_size, max_size,
@ -145,9 +143,7 @@ impl FunctionEntry {
}), }),
); );
self.menu_opened = ui.ctx().animate_bool(te_id, re.has_focus()); if ui.ctx().animate_bool(te_id, re.has_focus()) < 1.0 {
if self.menu_opened < 1.0 {
return; return;
} }