From 0176528ee730db5044ed302c663ca79a7f40bcc8 Mon Sep 17 00:00:00 2001 From: sedax90 <5001801+sedax90@users.noreply.github.com> Date: Sun, 8 Nov 2026 13:27:42 +0100 Subject: [PATCH 1/5] feat(linux-grid): add the Columns button to the bottom bar --- linux/crates/app/src/ui/browse_tab/layout.rs | 1 + .../crates/app/src/ui/browse_tab/tests/mod.rs | 20 ++++++++++++++ .../crates/app/src/ui/editor/results_pane.rs | 11 ++++++++ linux/data/resources/ui/browse-tab.ui | 26 +++++++++++++++++++ linux/data/resources/ui/results-pane.ui | 14 ++++++++++ 5 files changed, 72 insertions(+) diff --git a/linux/crates/app/src/ui/browse_tab/layout.rs b/linux/crates/app/src/ui/browse_tab/layout.rs index 95a8522f33..d4b8ea48e9 100644 --- a/linux/crates/app/src/ui/browse_tab/layout.rs +++ b/linux/crates/app/src/ui/browse_tab/layout.rs @@ -71,6 +71,7 @@ fn more_menu(page_sizes: &[u64]) -> gio::Menu { } let actions = gio::Menu::new(); actions.append(Some(&gettext("_Filter Rows")), Some("browse.filter")); + actions.append(Some(&gettext("Col_umns…")), Some("grid.columns")); actions.append_item(&export); actions.append(Some(&gettext("_Count Rows")), Some("browse.count-rows")); let sizes = gio::Menu::new(); diff --git a/linux/crates/app/src/ui/browse_tab/tests/mod.rs b/linux/crates/app/src/ui/browse_tab/tests/mod.rs index f9b9de38a4..5271ca6f6b 100644 --- a/linux/crates/app/src/ui/browse_tab/tests/mod.rs +++ b/linux/crates/app/src/ui/browse_tab/tests/mod.rs @@ -1536,3 +1536,23 @@ fn a_dotted_field_of_a_document_neither_sorts_nor_takes_an_edit() { assert!(!grid.edit().edit_cell(&cell), "the dotted field opened for editing"); assert_eq!(harness.tracker.pending_count(), 0); } + +/// The bar's Columns reaches the grid's column chooser, and gives way to +/// the More menu on a narrow tab. +#[gtk4::test] +fn the_bottom_bar_offers_the_column_chooser() { + use gtk4::prelude::*; + + let harness = Harness::open(serving_table(), []); + let tab = harness.tab().clone(); + let button = crate::test_support::descendants(&tab) + .into_iter() + .filter_map(|widget| widget.downcast::().ok()) + .find(|button| button.action_name().as_deref() == Some("grid.columns")) + .expect("a Columns button"); + + assert_eq!( + button.tooltip_text().as_deref(), + Some("Choose which columns the grid shows") + ); +} diff --git a/linux/crates/app/src/ui/editor/results_pane.rs b/linux/crates/app/src/ui/editor/results_pane.rs index 80799a0117..11e52fb193 100644 --- a/linux/crates/app/src/ui/editor/results_pane.rs +++ b/linux/crates/app/src/ui/editor/results_pane.rs @@ -54,6 +54,8 @@ mod imp { #[template_child] pub details_toggle: TemplateChild, #[template_child] + pub columns_button: TemplateChild, + #[template_child] pub transaction_bar: TemplateChild, #[template_child] pub transaction_label: TemplateChild, @@ -307,6 +309,7 @@ impl ResultsPane { let actions = grid.map(DataGrid::actions); self.insert_action_group("grid", actions.as_ref()); self.imp().details_toggle.set_visible(grid.is_some()); + self.imp().columns_button.set_visible(grid.is_some()); } /// Put the page of line `index` first among the kept ones, building @@ -562,6 +565,10 @@ mod tests { gtk4::AccessibleProperty::Label )); } + assert!(gtk4::test_accessible_has_property( + &pane.imp().columns_button.get(), + gtk4::AccessibleProperty::Label + )); } #[gtk4::test] @@ -571,6 +578,10 @@ mod tests { pane.append(&[command()]); assert!(!pane.imp().details_toggle.is_visible()); + assert!( + !pane.imp().columns_button.is_visible(), + "Columns without a grid to choose from" + ); assert!( pane.activate_action("grid.show-details", None).is_err(), "the pane reaches a grid it does not show" diff --git a/linux/data/resources/ui/browse-tab.ui b/linux/data/resources/ui/browse-tab.ui index 53d43a0eb7..798dd7bf0f 100644 --- a/linux/data/resources/ui/browse-tab.ui +++ b/linux/data/resources/ui/browse-tab.ui @@ -13,6 +13,7 @@ max-width: 680sp false false + false false true true @@ -195,6 +196,31 @@ + + + + Choose which columns the grid shows + grid.columns + + + + 6 + + + view-reveal-symbolic + + + + + Columns + + + + + + 6 diff --git a/linux/data/resources/ui/results-pane.ui b/linux/data/resources/ui/results-pane.ui index 398ebe75ae..91d117e571 100644 --- a/linux/data/resources/ui/results-pane.ui +++ b/linux/data/resources/ui/results-pane.ui @@ -80,6 +80,20 @@ + + + view-reveal-symbolic + Choose which columns the grid shows + grid.columns + false + + + Columns + + + From 206ec30193f0e5d22623a4220475ee49ea21a8cb Mon Sep 17 00:00:00 2001 From: sedax90 <5001801+sedax90@users.noreply.github.com> Date: Sun, 8 Nov 2026 13:28:38 +0100 Subject: [PATCH 2/5] docs(linux-grid): add the changelog entry --- linux/changelog.d/4118.added.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 linux/changelog.d/4118.added.md diff --git a/linux/changelog.d/4118.added.md b/linux/changelog.d/4118.added.md new file mode 100644 index 0000000000..35512e21df --- /dev/null +++ b/linux/changelog.d/4118.added.md @@ -0,0 +1 @@ +The bottom bar has a Columns button that opens the column chooser. From 62d20996a63d4bf9aca434dc073b7455f6394c41 Mon Sep 17 00:00:00 2001 From: Ngo Quoc Dat Date: Sun, 8 Nov 2026 23:45:29 +0700 Subject: [PATCH 3/5] fix(linux-grid): use a native Columns button and verify its actions --- .../crates/app/src/ui/browse_tab/tests/mod.rs | 57 ++++++++++++++----- .../crates/app/src/ui/editor/results_pane.rs | 41 +++++++++++++ linux/data/resources/ui/browse-tab.ui | 17 +----- 3 files changed, 85 insertions(+), 30 deletions(-) diff --git a/linux/crates/app/src/ui/browse_tab/tests/mod.rs b/linux/crates/app/src/ui/browse_tab/tests/mod.rs index 5271ca6f6b..20efefa273 100644 --- a/linux/crates/app/src/ui/browse_tab/tests/mod.rs +++ b/linux/crates/app/src/ui/browse_tab/tests/mod.rs @@ -1537,22 +1537,51 @@ fn a_dotted_field_of_a_document_neither_sorts_nor_takes_an_edit() { assert_eq!(harness.tracker.pending_count(), 0); } -/// The bar's Columns reaches the grid's column chooser, and gives way to -/// the More menu on a narrow tab. #[gtk4::test] fn the_bottom_bar_offers_the_column_chooser() { - use gtk4::prelude::*; - - let harness = Harness::open(serving_table(), []); - let tab = harness.tab().clone(); - let button = crate::test_support::descendants(&tab) - .into_iter() - .filter_map(|widget| widget.downcast::().ok()) - .find(|button| button.action_name().as_deref() == Some("grid.columns")) - .expect("a Columns button"); + use gtk4::subclass::prelude::ObjectSubclassIsExt; + use libadwaita::prelude::*; - assert_eq!( - button.tooltip_text().as_deref(), - Some("Choose which columns the grid shows") + let mut script = serving_table(); + script.run.always(FakeReply::ok(rows(&["Ada"]))); + let harness = Harness::open(script, []); + let tab = harness.tab(); + let window = crate::test_support::OwnedWindow::presented( + libadwaita::Window::builder() + .default_width(1000) + .default_height(500) + .content(tab) + .build(), ); + let button = crate::test_support::find_by_action_name(tab, "grid.columns") + .and_downcast::() + .expect("a Columns button"); + wait_until(WAIT, || !harness.shown().is_empty() && button.is_visible()).expect("the wide bar shows Columns"); + assert_eq!(button.label().as_deref(), Some("Columns")); + assert!(button.is_focusable()); + button.emit_clicked(); + wait_until(WAIT, || window.visible_dialog().is_some()).expect("Columns opens a dialog"); + let chooser = window.visible_dialog().expect("the chooser"); + assert!(chooser.is::()); + chooser.close(); + wait_until(WAIT, || window.visible_dialog().is_none()).expect("the chooser closes"); + + window.set_default_size(600, 500); + wait_until(WAIT, || !button.is_visible() && tab.imp().more_button.is_visible()) + .expect("the narrow bar offers More"); + let menu = tab.imp().more_button.menu_model().expect("More menu"); + let actions = menu + .item_link(0, gtk4::gio::MENU_LINK_SECTION) + .expect("actions section"); + assert!((0..actions.n_items()).any(|index| { + actions + .item_attribute_value(index, gtk4::gio::MENU_ATTRIBUTE_ACTION, None) + .and_then(|value| value.get::()) + .as_deref() + == Some("grid.columns") + })); + tab.activate_action("grid.columns", None) + .expect("More reaches the grid"); + wait_until(WAIT, || window.visible_dialog().is_some()).expect("More opens Columns"); + window.visible_dialog().expect("the chooser").close(); } diff --git a/linux/crates/app/src/ui/editor/results_pane.rs b/linux/crates/app/src/ui/editor/results_pane.rs index 11e52fb193..6ee4a68875 100644 --- a/linux/crates/app/src/ui/editor/results_pane.rs +++ b/linux/crates/app/src/ui/editor/results_pane.rs @@ -588,6 +588,47 @@ mod tests { ); } + #[gtk4::test] + fn columns_follows_the_shown_result_and_clears_with_the_run() { + use crate::ui::data_grid::test_grid::{Grid, named}; + use std::cell::Cell; + use std::rc::Rc; + + let grid = Grid::open(vec![named("id", "int", true)], vec![]); + grid.window.set_child(None::<>k4::Widget>); + let pane = pane(); + let result_grid = grid.grid.clone(); + pane.set_page_builder(move |index| { + Some(if index == 0 { + ResultPage { + widget: result_grid.clone().upcast(), + grid: Some(result_grid.clone()), + } + } else { + ResultPage::plain(gtk4::Label::new(Some("Done")).upcast()) + }) + }); + grid.window.set_child(Some(&pane)); + let activated = Rc::new(Cell::new(0)); + let count = activated.clone(); + let action = gio::SimpleAction::new("columns", None); + action.connect_activate(move |_, _| count.set(count.get() + 1)); + grid.grid.actions().add_action(&action); + pane.append(&[command(), command()]); + assert!(pane.imp().columns_button.is_visible()); + pane.imp().columns_button.emit_clicked(); + assert_eq!(activated.get(), 1); + pane.select(1); + assert!(!pane.imp().columns_button.is_visible()); + assert!(pane.activate_action("grid.columns", None).is_err()); + pane.select(0); + pane.imp().columns_button.emit_clicked(); + assert_eq!(activated.get(), 2); + pane.clear(); + assert!(!pane.imp().columns_button.is_visible()); + assert!(pane.activate_action("grid.columns", None).is_err()); + } + #[gtk4::test] fn a_long_list_builds_only_the_page_it_shows() { let pane = pane(); diff --git a/linux/data/resources/ui/browse-tab.ui b/linux/data/resources/ui/browse-tab.ui index 798dd7bf0f..7a4ec1a04d 100644 --- a/linux/data/resources/ui/browse-tab.ui +++ b/linux/data/resources/ui/browse-tab.ui @@ -197,28 +197,13 @@ - + Columns Choose which columns the grid shows grid.columns - - - 6 - - - view-reveal-symbolic - - - - - Columns - - - - From 3d88f3c5aed84c098b6c80126bba7f34a67e3f57 Mon Sep 17 00:00:00 2001 From: Ngo Quoc Dat Date: Sun, 8 Nov 2026 23:47:09 +0700 Subject: [PATCH 4/5] test(linux-grid): serve chooser rows through the query fixture --- linux/crates/app/src/ui/browse_tab/tests/mod.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux/crates/app/src/ui/browse_tab/tests/mod.rs b/linux/crates/app/src/ui/browse_tab/tests/mod.rs index 20efefa273..dd20ccd68d 100644 --- a/linux/crates/app/src/ui/browse_tab/tests/mod.rs +++ b/linux/crates/app/src/ui/browse_tab/tests/mod.rs @@ -1543,7 +1543,7 @@ fn the_bottom_bar_offers_the_column_chooser() { use libadwaita::prelude::*; let mut script = serving_table(); - script.run.always(FakeReply::ok(rows(&["Ada"]))); + script.query_bound.always(FakeReply::ok(rows(&["Ada"]))); let harness = Harness::open(script, []); let tab = harness.tab(); let window = crate::test_support::OwnedWindow::presented( From d66611ca1543be570757201ed15327c3821b283e Mon Sep 17 00:00:00 2001 From: Ngo Quoc Dat Date: Mon, 9 Nov 2026 01:45:15 +0700 Subject: [PATCH 5/5] test(linux-grid): wait for allocation before resizing the chooser host --- .../crates/app/src/ui/browse_tab/tests/mod.rs | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/linux/crates/app/src/ui/browse_tab/tests/mod.rs b/linux/crates/app/src/ui/browse_tab/tests/mod.rs index dd20ccd68d..37b1183146 100644 --- a/linux/crates/app/src/ui/browse_tab/tests/mod.rs +++ b/linux/crates/app/src/ui/browse_tab/tests/mod.rs @@ -1556,7 +1556,13 @@ fn the_bottom_bar_offers_the_column_chooser() { let button = crate::test_support::find_by_action_name(tab, "grid.columns") .and_downcast::() .expect("a Columns button"); - wait_until(WAIT, || !harness.shown().is_empty() && button.is_visible()).expect("the wide bar shows Columns"); + // A pending initial surface configure can otherwise overwrite the later resize. + wait_until(WAIT, || { + window.is_mapped() && tab.width() >= 900 && !harness.shown().is_empty() + }) + .expect("the wide window is allocated"); + assert!(tab.current_breakpoint().is_none()); + assert!(button.is_visible(), "the wide bar shows Columns"); assert_eq!(button.label().as_deref(), Some("Columns")); assert!(button.is_focusable()); button.emit_clicked(); @@ -1564,11 +1570,17 @@ fn the_bottom_bar_offers_the_column_chooser() { let chooser = window.visible_dialog().expect("the chooser"); assert!(chooser.is::()); chooser.close(); - wait_until(WAIT, || window.visible_dialog().is_none()).expect("the chooser closes"); + wait_until(WAIT, || window.visible_dialog().is_none() && chooser.parent().is_none()).expect("the chooser closes"); window.set_default_size(600, 500); - wait_until(WAIT, || !button.is_visible() && tab.imp().more_button.is_visible()) - .expect("the narrow bar offers More"); + assert!( + wait_until(WAIT, || tab.width() > 0 && tab.width() <= 600).is_ok(), + "the tab did not resize: window width {}, tab width {}", + window.width(), + tab.width(), + ); + assert!(!button.is_visible(), "the narrow bar hides Columns"); + assert!(tab.imp().more_button.is_visible(), "the narrow bar offers More"); let menu = tab.imp().more_button.menu_model().expect("More menu"); let actions = menu .item_link(0, gtk4::gio::MENU_LINK_SECTION)