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

function entry refactoring

Browse Source
This commit is contained in:
Simon Gardling 2022-04-20 10:46:50 -04:00
parent 4e3e08912f
commit 0336a34e40
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/function.rs
View File

@ -117,15 +117,20 @@ impl FunctionEntry {
// target size of text edit box // target size of text edit box
let target_size = vec2(ui.available_width(), { let target_size = vec2(ui.available_width(), {
// need to get whether or not the text box has focus so it can be used to get the animated bool value
let had_focus = ui.ctx().memory().has_focus(te_id); let had_focus = ui.ctx().memory().has_focus(te_id);
let gotten_value = ui.ctx().animate_bool(te_id, had_focus);
if gotten_value == 1.0 { // get the animated bool that stores how "in focus" the text box is
// text box is fully in focus, extra `1.5x` height for buttons let gotten_focus_value = ui.ctx().animate_bool(te_id, had_focus);
row_height * 2.5
// multiplier for row_width
let multiplier = if gotten_focus_value == 1.0 {
2.5
} else { } else {
// text box is NOT fully in focus, calculate offset to height based on `gotten_value` 1.0 + (gotten_focus_value * 1.5)
row_height * (1.0 + (gotten_value * 1.5)) };
}
row_height * multiplier
}); });
let re = ui.add_sized( let re = ui.add_sized(
@ -144,7 +149,7 @@ impl FunctionEntry {
}), }),
); );
// if not fully open, return here as buttons cannot yet be displayed // if not fully open, return here as buttons cannot yet be displayed, therefore the user is inable to mark it for deletion
if ui.ctx().animate_bool(te_id, re.has_focus()) < 1.0 { if ui.ctx().animate_bool(te_id, re.has_focus()) < 1.0 {
return false; return false;
} }
@ -202,9 +207,12 @@ impl FunctionEntry {
} }
} }
/// the y offset multiplier of the `buttons_area` area
const BUTTONS_Y_OFFSET: f32 = 1.32;
let buttons_area = egui::Area::new(format!("buttons_area_{}", i)) let buttons_area = egui::Area::new(format!("buttons_area_{}", i))
.fixed_pos(re.rect.min.offset_y(row_height * 1.32)) .fixed_pos(re.rect.min.offset_y(row_height * BUTTONS_Y_OFFSET))
.order(egui::Order::Foreground); .order(egui::Order::Foreground); // put it in the foreground so it's above the text edit box
/// Function that creates button that's used with the `button_area` /// Function that creates button that's used with the `button_area`
fn button_area_button(text: impl Into<egui::WidgetText>) -> Button { fn button_area_button(text: impl Into<egui::WidgetText>) -> Button {
@ -252,6 +260,7 @@ impl FunctionEntry {
); );
}); });
}); });
should_remove should_remove
} }