Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions linux/changelog.d/4113.added.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Search Row Details by field name or value, or show only fields with unsaved edits.
112 changes: 99 additions & 13 deletions linux/crates/app/src/ui/data_grid/row_detail/fields.rs
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,52 @@ impl RowDetailPane {
let imp = self.imp();
imp.selection.set_autoselect(false);
imp.selection.set_can_unselect(true);
imp.selection.set_model(Some(&imp.fields.0));
imp.filtered.set_model(Some(&imp.fields.0));
imp.filtered.set_filter(Some(&imp.field_filter));
imp.selection.set_model(Some(&imp.filtered));
imp.field_filter.set_filter_func(glib::clone!(
#[weak(rename_to = pane)]
self,
#[upgrade_or]
false,
move |item| pane.field_shown(field_of(Some(item.clone())))
));
imp.field_search.connect_search_changed(glib::clone!(
#[weak(rename_to = pane)]
self,
move |_| pane.refilter_fields()
));
imp.field_search.set_key_capture_widget(Some(&imp.field_list.get()));
imp.field_search.connect_search_started(|entry| {
entry.grab_focus();
});
imp.field_search.connect_stop_search(glib::clone!(
#[weak(rename_to = pane)]
self,
move |entry| {
if !entry.text().is_empty() {
entry.set_text("");
} else if pane.grid().is_some_and(|grid| grid.imp().split_view.is_collapsed()) {
pane.imp().close_button.emit_clicked();
}
}
));
imp.field_search.connect_activate(glib::clone!(
#[weak(rename_to = pane)]
self,
move |_| {
pane.refilter_fields();
if pane.imp().filtered.n_items() > 0 {
pane.imp().selection.set_selected(0);
pane.focus_value();
}
}
));
imp.edited_toggle.connect_toggled(glib::clone!(
#[weak(rename_to = pane)]
self,
move |_| pane.refilter_fields()
));
imp.field_list.set_model(Some(&imp.selection));
imp.field_list.set_factory(Some(&self.field_factory()));
imp.selection.connect_selected_notify(glib::clone!(
Expand Down Expand Up @@ -237,12 +282,56 @@ impl RowDetailPane {
}

pub(super) fn redraw_fields(&self) {
self.refilter_fields();
let bound: Vec<gtk::ListItem> = self.imp().bound.borrow().clone();
for item in &bound {
self.draw_field(item);
}
}

pub(super) fn refilter_fields(&self) {
let imp = self.imp();
let has_edits = self.grid().zip(self.current_row()).is_some_and(|(grid, row)| {
grid.grid_columns().iter().any(|column| {
let mark = grid.tracked().mark(&row, column.index);
mark.state == CellState::Modified && !mark.row_deleted
})
});
imp.edited_toggle
.set_sensitive(has_edits || imp.edited_toggle.is_active());
// A changed filter may move the selected position without a user picking a field.
let syncing = imp.syncing.replace(true);
imp.field_filter.changed(gtk::FilterChange::Different);
self.select_in_list(imp.field.get());
imp.syncing.set(syncing);
imp.field_results.set_visible_child_name(match imp.filtered.n_items() {
0 => "empty",
_ => "fields",
});
}

fn field_shown(&self, column: Option<usize>) -> bool {
let imp = self.imp();
let (Some(grid), Some(column), Some(row)) = (self.grid(), column, self.current_row()) else {
return false;
};
let Some(column) = grid.grid_columns().get(column).cloned() else {
return false;
};
if imp.edited_toggle.is_active() {
let mark = grid.tracked().mark(&row, column.index);
if mark.state != CellState::Modified || mark.row_deleted {
return false;
}
}
let wanted = imp.field_search.text().to_lowercase();
if wanted.is_empty() || column.name.to_lowercase().contains(&wanted) {
return true;
}
let value = field_value(&grid.tracked(), &row, &column);
!value.null && value.text.to_lowercase().contains(&wanted)
}

fn draw_field(&self, item: &gtk::ListItem) {
let (Some(grid), Some(index)) = (self.grid(), field_of(item.item())) else {
return;
Expand Down Expand Up @@ -324,16 +413,16 @@ impl RowDetailPane {

pub(super) fn select_in_list(&self, column: Option<usize>) {
let imp = self.imp();
let store = &imp.fields.0;
let shown = &imp.selection;
let position = column
.and_then(|column| (0..store.n_items()).find(|position| field_of(store.item(*position)) == Some(column)))
.and_then(|column| (0..shown.n_items()).find(|position| field_of(shown.item(*position)) == Some(column)))
.unwrap_or(gtk::INVALID_LIST_POSITION);
if imp.selection.selected() == position {
return;
}
imp.syncing.set(true);
let syncing = imp.syncing.replace(true);
imp.selection.set_selected(position);
imp.syncing.set(false);
imp.syncing.set(syncing);
if position != gtk::INVALID_LIST_POSITION {
imp.field_list.scroll_to(position, gtk::ListScrollFlags::NONE, None);
}
Expand Down Expand Up @@ -369,17 +458,15 @@ impl RowDetailPane {
move || {
pane.imp().sync_queued.set(false);
pane.watch_column_visibility();
if pane.sync_fields() {
pane.render();
}
pane.sync_fields();
pane.render();
}
));
}

/// Put the fields in the grid's column order. `true` when it changed.
pub(super) fn sync_fields(&self) -> bool {
pub(super) fn sync_fields(&self) {
let Some(grid) = self.grid() else {
return false;
return;
};
let imp = self.imp();
let wanted = field_order(&grid.shown_columns(), grid.grid_columns().len());
Expand All @@ -388,7 +475,7 @@ impl RowDetailPane {
.filter_map(|position| field_of(store.item(position)))
.collect();
if held == wanted {
return false;
return;
}
let items: Vec<glib::BoxedAnyObject> = wanted.into_iter().map(glib::BoxedAnyObject::new).collect();
imp.syncing.set(true);
Expand All @@ -399,7 +486,6 @@ impl RowDetailPane {
imp.field.set(None);
}
self.select_in_list(imp.field.get());
true
}

fn watch_column_visibility(&self) {
Expand Down
8 changes: 8 additions & 0 deletions linux/crates/app/src/ui/data_grid/row_detail/imp.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,12 @@ pub struct RowDetailPane {
#[template_child]
pub field_list: TemplateChild<gtk::ListView>,
#[template_child]
pub field_results: TemplateChild<gtk::Stack>,
#[template_child]
pub field_search: TemplateChild<gtk::SearchEntry>,
#[template_child]
pub edited_toggle: TemplateChild<gtk::ToggleButton>,
#[template_child]
pub field_label: TemplateChild<gtk::Label>,
#[template_child]
pub choice_button: TemplateChild<gtk::MenuButton>,
Expand Down Expand Up @@ -80,6 +86,8 @@ pub struct RowDetailPane {
pub grid: glib::WeakRef<DataGrid>,
pub fields: Fields,
pub selection: gtk::SingleSelection,
pub filtered: gtk::FilterListModel,
pub field_filter: gtk::CustomFilter,
/// The row the pane shows, while it has one.
pub shown: RefCell<Option<Shown>>,
/// The data column of the selected field.
Expand Down
1 change: 1 addition & 0 deletions linux/crates/app/src/ui/data_grid/row_detail/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -282,6 +282,7 @@ impl RowDetailPane {
}

fn show_nothing(&self) {
self.refilter_fields();
self.imp().stack.set_visible_child_name("empty");
self.imp().loaded.take();
}
Expand Down
Loading
Loading