@@ -54,6 +54,8 @@ mod imp {
5454 #[ template_child]
5555 pub details_toggle : TemplateChild < gtk4:: ToggleButton > ,
5656 #[ template_child]
57+ pub columns_button : TemplateChild < gtk4:: Button > ,
58+ #[ template_child]
5759 pub transaction_bar : TemplateChild < gtk4:: Box > ,
5860 #[ template_child]
5961 pub transaction_label : TemplateChild < gtk4:: Label > ,
@@ -307,6 +309,7 @@ impl ResultsPane {
307309 let actions = grid. map ( DataGrid :: actions) ;
308310 self . insert_action_group ( "grid" , actions. as_ref ( ) ) ;
309311 self . imp ( ) . details_toggle . set_visible ( grid. is_some ( ) ) ;
312+ self . imp ( ) . columns_button . set_visible ( grid. is_some ( ) ) ;
310313 }
311314
312315 /// Put the page of line `index` first among the kept ones, building
@@ -562,6 +565,10 @@ mod tests {
562565 gtk4:: AccessibleProperty :: Label
563566 ) ) ;
564567 }
568+ assert ! ( gtk4:: test_accessible_has_property(
569+ & pane. imp( ) . columns_button. get( ) ,
570+ gtk4:: AccessibleProperty :: Label
571+ ) ) ;
565572 }
566573
567574 #[ gtk4:: test]
@@ -571,12 +578,57 @@ mod tests {
571578 pane. append ( & [ command ( ) ] ) ;
572579
573580 assert ! ( !pane. imp( ) . details_toggle. is_visible( ) ) ;
581+ assert ! (
582+ !pane. imp( ) . columns_button. is_visible( ) ,
583+ "Columns without a grid to choose from"
584+ ) ;
574585 assert ! (
575586 pane. activate_action( "grid.show-details" , None ) . is_err( ) ,
576587 "the pane reaches a grid it does not show"
577588 ) ;
578589 }
579590
591+ #[ gtk4:: test]
592+ fn columns_follows_the_shown_result_and_clears_with_the_run ( ) {
593+ use crate :: ui:: data_grid:: test_grid:: { Grid , named} ;
594+ use std:: cell:: Cell ;
595+ use std:: rc:: Rc ;
596+
597+ let grid = Grid :: open ( vec ! [ named( "id" , "int" , true ) ] , vec ! [ ] ) ;
598+ grid. window . set_child ( None :: < & gtk4:: Widget > ) ;
599+ let pane = pane ( ) ;
600+ let result_grid = grid. grid . clone ( ) ;
601+ pane. set_page_builder ( move |index| {
602+ Some ( if index == 0 {
603+ ResultPage {
604+ widget : result_grid. clone ( ) . upcast ( ) ,
605+ grid : Some ( result_grid. clone ( ) ) ,
606+ }
607+ } else {
608+ ResultPage :: plain ( gtk4:: Label :: new ( Some ( "Done" ) ) . upcast ( ) )
609+ } )
610+ } ) ;
611+ grid. window . set_child ( Some ( & pane) ) ;
612+ let activated = Rc :: new ( Cell :: new ( 0 ) ) ;
613+ let count = activated. clone ( ) ;
614+ let action = gio:: SimpleAction :: new ( "columns" , None ) ;
615+ action. connect_activate ( move |_, _| count. set ( count. get ( ) + 1 ) ) ;
616+ grid. grid . actions ( ) . add_action ( & action) ;
617+ pane. append ( & [ command ( ) , command ( ) ] ) ;
618+ assert ! ( pane. imp( ) . columns_button. is_visible( ) ) ;
619+ pane. imp ( ) . columns_button . emit_clicked ( ) ;
620+ assert_eq ! ( activated. get( ) , 1 ) ;
621+ pane. select ( 1 ) ;
622+ assert ! ( !pane. imp( ) . columns_button. is_visible( ) ) ;
623+ assert ! ( pane. activate_action( "grid.columns" , None ) . is_err( ) ) ;
624+ pane. select ( 0 ) ;
625+ pane. imp ( ) . columns_button . emit_clicked ( ) ;
626+ assert_eq ! ( activated. get( ) , 2 ) ;
627+ pane. clear ( ) ;
628+ assert ! ( !pane. imp( ) . columns_button. is_visible( ) ) ;
629+ assert ! ( pane. activate_action( "grid.columns" , None ) . is_err( ) ) ;
630+ }
631+
580632 #[ gtk4:: test]
581633 fn a_long_list_builds_only_the_page_it_shows ( ) {
582634 let pane = pane ( ) ;
0 commit comments