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

UI macro syntax now differentiates at-properties from arguments

Browse source
This commit is contained in:
Reinout Meliesie 2025-02-04 15:02:58 +01:00
parent ed18e738eb
commit ce70725b60
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
8 changed files with 80 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -20,11 +20,11 @@ impl FilmCollationMenu {
let film_sort_button = FilmSortButton :: new (on_sort) ;
let widget = g_box ! (
@ orientation : Horizontal ,
@ halign : Center ,
@ spacing : 20 ,
@ widget_name : "film-collation-menu" ,
@ css_classes : [ "toolbar" ] ,
@ orientation : Horizontal ;
@ halign : Center ;
@ spacing : 20 ;
@ widget_name : "film-collation-menu" ;
@ css_classes : [ "toolbar" ] ;
* film_sort_button . get_widget () ,
) ;
@ -36,11 +36,11 @@ impl SeriesCollationMenu {
let series_sort_button = SeriesSortButton :: new (on_sort) ;
let widget = g_box ! (
@ orientation : Horizontal ,
@ halign : Center ,
@ spacing : 20 ,
@ widget_name : "series-collation-menu" ,
@ css_classes : [ "toolbar" ] ,
@ orientation : Horizontal ;
@ halign : Center ;
@ spacing : 20 ;
@ widget_name : "series-collation-menu" ;
@ css_classes : [ "toolbar" ] ;
* series_sort_button . get_widget () ,
) ;

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

@ -32,28 +32,28 @@ impl FilmSortButton {
let widget = split_button ! (
@ popover : popover ! (
@ css_classes : [ "menu" ] ,
@ css_classes : [ "menu" ] ;
list_box ! (
@ connect_row_activated : move | _ , row | {
on_film_sort_activated ( row , previous_sorting , & on_sort , sort_icons ) ;
} ,
} ;
g_box ! (
@ orientation : Horizontal , @ spacing : 20 ,
label ! ( @ hexpand : true , @ halign : Start , "Name" ) ,
@ orientation : Horizontal ; @ spacing : 20 ;
label ! ( @ hexpand : true ; @ halign : Start ; "Name" ) ,
sort_icons [0] ,
) ,
g_box ! (
@ orientation : Horizontal , @ spacing : 20 ,
label ! ( @ hexpand : true , @ halign : Start , "Release date" ) ,
@ orientation : Horizontal ; @ spacing : 20 ;
label ! ( @ hexpand : true ; @ halign : Start ; "Release date" ) ,
sort_icons [1] ,
) ,
g_box ! (
@ orientation : Horizontal , @ spacing : 20 ,
label ! ( @ hexpand : true , @ halign : Start , "Runtime" ) ,
@ orientation : Horizontal ; @ spacing : 20 ;
label ! ( @ hexpand : true ; @ halign : Start ; "Runtime" ) ,
sort_icons [2] ,
) ,
) ,
) ,
) ;
label ! ("Sort") ,
) ;
@ -71,23 +71,23 @@ impl SeriesSortButton {
let widget = split_button ! (
@ popover : popover ! (
@ css_classes : [ "menu" ] ,
@ css_classes : [ "menu" ] ;
list_box ! (
@ connect_row_activated : move | _ , row | {
on_series_sort_activated ( row , previous_sorting , & on_sort , sort_icons ) ;
} ,
} ;
g_box ! (
@ orientation : Horizontal , @ spacing : 20 ,
label ! ( @ hexpand : true , @ halign : Start , "Name" ) ,
@ orientation : Horizontal ; @ spacing : 20 ;
label ! ( @ hexpand : true ; @ halign : Start ; "Name" ) ,
sort_icons [0] ,
) ,
g_box ! (
@ orientation : Horizontal , @ spacing : 20 ,
label ! ( @ hexpand : true , @ halign : Start , "First release date" ) ,
@ orientation : Horizontal ; @ spacing : 20 ;
label ! ( @ hexpand : true ; @ halign : Start ; "First release date" ) ,
sort_icons [1] ,
) ,
) ,
) ,
) ;
label ! ("Sort") ,
) ;