Place close action after editor controls
Beffroi/beffroi-tools/pipeline/head This commit looks good
Details
Beffroi/beffroi-tools/pipeline/head This commit looks good
Details
This commit is contained in:
parent
52135e34d0
commit
cbbd22427c
|
|
@ -974,14 +974,7 @@ impl App {
|
|||
});
|
||||
if preview.gap { ui.small("Gap interval · duration is elapsed time; allocation follows the selected gap resolution."); }
|
||||
});
|
||||
ui.horizontal(|ui| {
|
||||
ui.heading("Edit row");
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
if ui.button("Close").clicked() {
|
||||
close = true;
|
||||
}
|
||||
});
|
||||
});
|
||||
ui.heading("Edit row");
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
ui.label("Row type");
|
||||
let detected = match preview.kind.as_str() {
|
||||
|
|
@ -1038,6 +1031,11 @@ impl App {
|
|||
});
|
||||
ui.small("Leave a field empty to use or calculate it from the source values. Apply & recheck after closing the editor.");
|
||||
}
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
if ui.button("Close").clicked() {
|
||||
close = true;
|
||||
}
|
||||
});
|
||||
if let Some(a) = &self.analysis {
|
||||
if !preview.issues.is_empty() { ui.heading("Needs attention"); }
|
||||
for index in &preview.issues {
|
||||
|
|
@ -1150,18 +1148,16 @@ impl App {
|
|||
}
|
||||
});
|
||||
});
|
||||
ui.horizontal(|ui| {
|
||||
ui.heading("Gap resolution");
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
if ui.button("Close").clicked() {
|
||||
close = true;
|
||||
}
|
||||
});
|
||||
});
|
||||
ui.heading("Gap resolution");
|
||||
ui.push_id("gap_inspector", |ui| {
|
||||
Self::gap_resolution_control(ui, &mut profile, key);
|
||||
});
|
||||
ui.small("Keep gap leaves this interval without an Ontime timer. Apply & recheck after changing the allocation.");
|
||||
ui.with_layout(egui::Layout::right_to_left(egui::Align::Center), |ui| {
|
||||
if ui.button("Close").clicked() {
|
||||
close = true;
|
||||
}
|
||||
});
|
||||
if let Some(a) = &self.analysis {
|
||||
if !preview.issues.is_empty() {
|
||||
ui.heading("Needs attention");
|
||||
|
|
@ -2155,6 +2151,14 @@ mod tests {
|
|||
.iter()
|
||||
.any(|(s, _)| s == "Inferred schedule interval · no source row or timer")
|
||||
);
|
||||
let gap_choice = labels
|
||||
.iter()
|
||||
.rev()
|
||||
.find(|(s, _)| s == "Keep gap")
|
||||
.unwrap()
|
||||
.1;
|
||||
let close = labels.iter().find(|(s, _)| s == "Close").unwrap().1;
|
||||
assert!(close.top() > gap_choice.bottom());
|
||||
app.row_details = false;
|
||||
let labels = render(&mut app, &ctx, [860.0, 900.0], vec![]);
|
||||
let button = labels
|
||||
|
|
@ -2831,12 +2835,14 @@ mod tests {
|
|||
assert!(app.dirty);
|
||||
let labels = render(&mut app, &ctx, size, vec![]);
|
||||
assert!(labels.iter().any(|(text, _)| text == "2 ✎"));
|
||||
let close = labels
|
||||
let corrections = labels
|
||||
.iter()
|
||||
.find(|(s, _)| s == "Close")
|
||||
.find(|(s, _)| s == "Timing corrections")
|
||||
.unwrap()
|
||||
.1
|
||||
.center();
|
||||
.1;
|
||||
let close_rect = labels.iter().find(|(s, _)| s == "Close").unwrap().1;
|
||||
assert!(close_rect.top() > corrections.bottom());
|
||||
let close = close_rect.center();
|
||||
click_size(&mut app, &ctx, close, size);
|
||||
assert!(!app.row_details);
|
||||
render(
|
||||
|
|
@ -3137,8 +3143,9 @@ mod tests {
|
|||
app.review_view = ReviewView::Rows;
|
||||
let ctx = egui::Context::default();
|
||||
configure_style(&ctx);
|
||||
render(&mut app, &ctx, [860.0, 900.0], vec![]);
|
||||
let labels = render(&mut app, &ctx, [860.0, 900.0], vec![]);
|
||||
let size = [860.0, 900.0];
|
||||
render(&mut app, &ctx, size, vec![]);
|
||||
let labels = render(&mut app, &ctx, size, vec![]);
|
||||
assert!(labels.iter().any(|(s, _)| s == "Auto (Event)"));
|
||||
let resolve = labels
|
||||
.iter()
|
||||
|
|
@ -3146,18 +3153,32 @@ mod tests {
|
|||
.unwrap()
|
||||
.1
|
||||
.center();
|
||||
click_size(&mut app, &ctx, resolve, [860.0, 900.0]);
|
||||
click_size(&mut app, &ctx, resolve, size);
|
||||
assert!(app.review_view == ReviewView::Rows);
|
||||
assert_eq!(app.selected_row, Some(3));
|
||||
assert!(app.row_details);
|
||||
assert!(!app.show_issue_details);
|
||||
render(&mut app, &ctx, [860.0, 900.0], vec![]);
|
||||
let labels = render(&mut app, &ctx, [860.0, 900.0], vec![]);
|
||||
assert!(labels.iter().any(|(s, _)| s == "Original cells"));
|
||||
assert!(labels.iter().any(|(s, _)| s == "ROW WITHOUT A TIMING"));
|
||||
assert!(labels.iter().any(|(s, _)| s == "Empty"));
|
||||
render(&mut app, &ctx, size, vec![]);
|
||||
let labels = render(&mut app, &ctx, size, vec![]);
|
||||
assert!(labels.iter().any(|(s, _)| s == "e.g. 09:00"));
|
||||
assert!(labels.iter().any(|(s, _)| s == "e.g. 2 min"));
|
||||
assert!(labels.iter().any(|(s, _)| s == "Close"));
|
||||
render(
|
||||
&mut app,
|
||||
&ctx,
|
||||
size,
|
||||
vec![
|
||||
egui::Event::PointerMoved(egui::pos2(size[0] / 2.0, size[1] / 2.0)),
|
||||
egui::Event::MouseWheel {
|
||||
unit: egui::MouseWheelUnit::Page,
|
||||
delta: egui::vec2(0.0, -1.0),
|
||||
modifiers: Default::default(),
|
||||
},
|
||||
],
|
||||
);
|
||||
let labels = render(&mut app, &ctx, size, vec![]);
|
||||
assert!(labels.iter().any(|(s, _)| s == "Original cells"));
|
||||
assert!(labels.iter().any(|(s, _)| s == "Empty"));
|
||||
}
|
||||
|
||||
#[test]
|
||||
|
|
|
|||
Loading…
Reference in New Issue