zedfrigg/zoodex
1
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Reimplement collation menu as component

Browse source
This commit is contained in:
Reinout Meliesie 2025-01-31 15:34:09 +01:00
parent ebc8bc0d2f
commit 04755fabb7
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
4 changed files with 133 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/ui/collatable_container/collation_menu/mod.rs
View file

@ -3,8 +3,7 @@ mod sort_button ;
use {
gtk4 :: {
Box , Image , Label , ListBox , ListBoxRow , Popover ,
Align :: * ,
Orientation :: * ,
Align :: * , Orientation :: * ,
prelude :: * ,
} ,
libadwaita :: * ,
@ -12,33 +11,31 @@ use {
} ;
use crate :: {
ui :: { collatable_container :: * , component :: * , utility :: * } ,
ui :: {
component :: * , utility :: * ,
collatable_container :: { * , collation_menu :: sort_button :: * } } ,
utility :: * ,
} ;
pub struct FilmCollationMenu {
widget : Box ,
sorting : & 'static RefCell < ( FilmsSortedBy , SortingDirection ) > ,
}
pub struct FilmCollationMenu { widget : Box }
pub struct SeriesCollationMenu { widget : Box }
impl FilmCollationMenu {
pub fn new < F : Fn ( FilmsSortedBy , SortingDirection ) + 'static > ( on_sort : F ) -> Self {
let widget = Box :: builder ()
. orientation (Horizontal)
. halign (Center)
. spacing (20)
. name ("film-collation-menu")
. css_classes ( ["toolbar"] )
. build () ;
let sorting = leak ( RefCell :: new ( ( FilmsSortedBy :: Name , SortingDirection :: Ascending ) ) ) ;
let film_sort_button = FilmSortButton :: new (on_sort) ;
widget . append ( & create_sort_button ( & create_films_sort_menu ( sorting , on_sort ) ) ) ;
widget . append ( & create_filter_button () ) ;
let widget = g_box ! (
@ orientation : Horizontal ,
@ halign : Center ,
@ spacing : 20 ,
@ widget_name : "film-collation-menu" ,
@ css_classes : [ "toolbar" ] ,
* film_sort_button . get_widget ()
) ;
Self { widget , sorting }
Self { widget }
}
}
impl SeriesCollationMenu {
@ -126,12 +123,12 @@ fn create_sort_menu_entry ( label : & str , reverse : bool ) -> ListBoxRow {
let container = g_box ! (
@ orientation : Horizontal ,
& Label :: builder ()
Label :: builder ()
. label (label)
. hexpand (true)
. halign (Start)
. build () ,
& icon ,
icon ,
) ;
container . set_spacing (20) ;

69
src/ui/collatable_container/collation_menu/sort_button.rs
View file

@ -1,18 +1,71 @@
use libadwaita :: * ;
use { gtk4 :: Align :: * , libadwaita :: * , std :: cell :: * } ;
use crate :: ui :: { * , utility :: * } ;
use crate :: { utility :: * , ui :: { * , utility :: * } } ;
pub struct FilmSortButton { widget : SplitButton }
pub struct FilmSortButton {
widget : SplitButton ,
previous_sorting : & 'static RefCell < ( FilmsSortedBy , SortingDirection ) > ,
}
impl FilmSortButton {
pub fn new () -> Self {
let widget = SplitButton :: builder ()
. child ( & label ! ("Sort") )
. build () ;
pub fn new < F : Fn ( FilmsSortedBy , SortingDirection ) + 'static > ( on_sort : F ) -> Self {
let list_box = list_box ! (
g_box ! (
@ orientation : Horizontal , @ spacing : 20 ,
label ! ( @ hexpand : true , @ halign : Start , "Name" ) ,
icon ! ("view-sort-ascending-symbolic") ,
) ,
g_box ! (
@ orientation : Horizontal , @ spacing : 20 ,
label ! ( @ hexpand : true , @ halign : Start , "Release date" ) ,
icon ! ("view-sort-ascending-symbolic") ,
) ,
g_box ! (
@ orientation : Horizontal , @ spacing : 20 ,
label ! ( @ hexpand : true , @ halign : Start , "Runtime" ) ,
icon ! ("view-sort-ascending-symbolic") ,
) ,
) ;
Self { widget }
let widget = split_button ! (
@ popover : popover ! ( @ css_classes : [ "menu" ] , list_box ) ,
label ! ("Sort") ,
) ;
let previous_sorting = leak ( RefCell :: new (
( FilmsSortedBy :: Name , SortingDirection :: Ascending )
) ) ;
list_box . connect_row_activated ( move | _ , row | {
let sorting_property = match row . index () {
0 => FilmsSortedBy :: Name ,
1 => FilmsSortedBy :: ReleaseDate ,
2 => FilmsSortedBy :: Runtime ,
_ => panic ! () ,
} ;
let previous_sorting_property = previous_sorting . borrow () . 0 ;
if sorting_property == previous_sorting_property {
let previous_sorting_direction = previous_sorting . borrow () . 1 ;
match previous_sorting_direction {
SortingDirection :: Ascending => {
previous_sorting . replace ( ( sorting_property , SortingDirection :: Descending ) ) ;
on_sort ( sorting_property , SortingDirection :: Descending ) ;
} ,
SortingDirection :: Descending => {
previous_sorting . replace ( ( sorting_property , SortingDirection :: Ascending ) ) ;
on_sort ( sorting_property , SortingDirection :: Ascending ) ;
} ,
}
} else {
previous_sorting . replace ( ( sorting_property , SortingDirection :: Ascending ) ) ;
on_sort ( sorting_property , SortingDirection :: Ascending ) ;
}
} ) ;
Self { widget , previous_sorting }
}
}