pjht/film-manager
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: pjht:3ff8bc276bac12b042710661908b9f28f7528407
Branches Tags
pjht:master
...
compare: pjht:05e5a293a6df62c06eafbd81fd0454bd4c8e5a13
Branches Tags
pjht:master

2 Commits
3ff8bc276b ... 05e5a293a6

Author SHA1 Message Date
pjht
05e5a293a6
Refactor code checking for user action on any item in a table row 2023-06-01 14:53:11 -05:00
pjht
0232363e73
Show film and ISO roll was shot for each roll in table 2023-06-01 14:16:25 -05:00
1 changed files with 27 additions and 57 deletions
Show Stats Expand all files Collapse all files

84
src/main.rs
View File

@ -7,7 +7,7 @@ mod roll;
mod roll_view; mod roll_view;
use edit_films::EditFilmsWindow; use edit_films::EditFilmsWindow;
use eframe::egui::{self, menu, Button, Label, Response, Sense}; use eframe::egui::{self, menu, widgets, Button, Label, Response, Sense};
use film::{Film, FilmKey}; use film::{Film, FilmKey};
use new_roll::NewRollWindow; use new_roll::NewRollWindow;
use roll::Roll; use roll::Roll;
@ -41,7 +41,6 @@ struct MyApp {
roll_views: Vec<RollViewWindow>, roll_views: Vec<RollViewWindow>,
new_roll_window: Option<NewRollWindow>, new_roll_window: Option<NewRollWindow>,
edit_films_window: Option<EditFilmsWindow>, edit_films_window: Option<EditFilmsWindow>,
film_rows_popup_location: Option<Response>,
} }
impl MyApp { impl MyApp {
@ -56,7 +55,6 @@ impl MyApp {
roll_views: Vec::new(), roll_views: Vec::new(),
new_roll_window: None, new_roll_window: None,
edit_films_window: None, edit_films_window: None,
film_rows_popup_location: None,
} }
} }
} }
@ -83,75 +81,47 @@ impl eframe::App for MyApp {
ui.heading("Film Manager"); ui.heading("Film Manager");
egui::Grid::new("roll_table") egui::Grid::new("roll_table")
.striped(true) .striped(true)
.num_columns(4) .num_columns(6)
.show(ui, |ui| { .show(ui, |ui| {
ui.heading("ID"); ui.heading("ID ⏷");
ui.heading("Name"); ui.heading("Name");
ui.heading("Date"); ui.heading("Date");
ui.heading("Exposures"); ui.heading("Exposures");
ui.heading("Film");
ui.heading("Shot at");
ui.end_row(); ui.end_row();
for (i, roll) in self.state.rolls.iter().enumerate() { for (i, roll) in self.state.rolls.iter().enumerate() {
let id_label = ui.add(Label::new(&roll.id).sense(Sense::click())); let mut widget_resps = Vec::new();
let name_label = ui.add(Label::new(&roll.name).sense(Sense::click())); widget_resps.push(ui.add(Label::new(&roll.id).sense(Sense::click())));
let date_label = ui.add( widget_resps.push(ui.add(Label::new(&roll.name).sense(Sense::click())));
widget_resps.push(ui.add(
Label::new(&roll.date.format("%Y-%m-%d").to_string()) Label::new(&roll.date.format("%Y-%m-%d").to_string())
.sense(Sense::click()), .sense(Sense::click()),
); ));
let exps_label = ui.add( widget_resps.push(ui.add(
Label::new(&roll.exposures.len().to_string()).sense(Sense::click()), Label::new(&roll.exposures.len().to_string()).sense(Sense::click()),
); ));
let clicked = id_label.clicked() widget_resps.push(ui.add(
|| name_label.clicked() Label::new(&self.state.films[roll.film].name).sense(Sense::click()),
|| date_label.clicked() ));
|| exps_label.clicked(); let shot_at_text = if let Some(shot_at) = roll.shot_at {
let old_film_rows_popup_location = self.film_rows_popup_location.clone(); format!("{} ISO", shot_at)
let secondary_clicked = if id_label.secondary_clicked() {
self.film_rows_popup_location = Some(id_label.clone());
true
} else if name_label.secondary_clicked() {
self.film_rows_popup_location = Some(name_label.clone());
true
} else if date_label.secondary_clicked() {
self.film_rows_popup_location = Some(date_label.clone());
true
} else if exps_label.secondary_clicked() {
self.film_rows_popup_location = Some(exps_label.clone());
true
} else { } else {
false format!("{} ISO (box speed)", &self.state.films[roll.film].iso)
}; };
let hovered = id_label.hovered() widget_resps.push(ui.add(Label::new(shot_at_text).sense(Sense::click())));
|| name_label.hovered()
|| date_label.hovered() if widget_resps.iter().any(|resp| resp.clicked())
|| exps_label.hovered(); && !self.roll_views.iter().any(|view| view.roll() == i)
if hovered { {
id_label.highlight();
name_label.highlight();
date_label.highlight();
exps_label.highlight();
}
if clicked && !self.roll_views.iter().any(|view| view.roll() == i) {
self.roll_views.push(RollViewWindow::new(i)); self.roll_views.push(RollViewWindow::new(i));
} }
let popup_id = ui.make_persistent_id("roll_context_menu"); let hovered = widget_resps.iter().any(|resp| resp.hovered());
if secondary_clicked { for widget_resp in widget_resps {
if self.film_rows_popup_location.is_some() if hovered {
&& self.film_rows_popup_location.as_ref().map(|resp| resp.id) widget_resp.highlight();
== old_film_rows_popup_location.as_ref().map(|resp| resp.id)
{
ui.memory_mut(|mem| mem.close_popup());
} else {
ui.memory_mut(|mem| mem.open_popup(popup_id));
} }
} }
if let Some(film_rows_popup_location) = &self.film_rows_popup_location {
egui::popup_below_widget(
ui,
popup_id,
&film_rows_popup_location,
|_ui| {},
);
}
ui.end_row(); ui.end_row();
} }
}); });