tyiu/notedeck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

timeline: simplify tabs_ui

Browse Source 
we don't really need to pass a timeline into it

Signed-off-by: William Casarin <jb55@jb55.com>
This commit is contained in:
William Casarin
2024-07-16 12:31:15 -07:00
parent bf57e3b780
commit 758de6b024
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/timeline.rs
View File

@@ -175,7 +175,7 @@ fn shrink_range_to_width(range: egui::Rangef, width: f32) -> egui::Rangef {
egui::Rangef::new(min, max) egui::Rangef::new(min, max)
} }
fn tabs_ui(timeline: &mut Timeline, ui: &mut egui::Ui) { fn tabs_ui(ui: &mut egui::Ui) -> i32 {
ui.spacing_mut().item_spacing.y = 0.0; ui.spacing_mut().item_spacing.y = 0.0;
let tab_res = egui_tabs::Tabs::new(2) let tab_res = egui_tabs::Tabs::new(2)
@@ -213,9 +213,6 @@ fn tabs_ui(timeline: &mut Timeline, ui: &mut egui::Ui) {
let sel = tab_res.selected().unwrap_or_default(); let sel = tab_res.selected().unwrap_or_default();
// fun animation
timeline.selected_view = sel;
let (underline, underline_y) = tab_res.inner()[sel as usize].inner; let (underline, underline_y) = tab_res.inner()[sel as usize].inner;
let underline_width = underline.span(); let underline_width = underline.span();
@@ -242,6 +239,8 @@ fn tabs_ui(timeline: &mut Timeline, ui: &mut egui::Ui) {
let underline = egui::Rangef::new(x, x + w); let underline = egui::Rangef::new(x, x + w);
ui.painter().hline(underline, underline_y, stroke); ui.painter().hline(underline, underline_y, stroke);
sel
} }
pub fn timeline_view(ui: &mut egui::Ui, app: &mut Damus, timeline: usize) { pub fn timeline_view(ui: &mut egui::Ui, app: &mut Damus, timeline: usize) {
@@ -289,7 +288,7 @@ pub fn timeline_view(ui: &mut egui::Ui, app: &mut Damus, timeline: usize) {
} }
} }
tabs_ui(&mut app.timelines[timeline], ui); app.timelines[timeline].selected_view = tabs_ui(ui);
// need this for some reason?? // need this for some reason??
ui.add_space(3.0); ui.add_space(3.0);