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

Include static lifetime in MediaAdapter trait, formatting

Browse source
This commit is contained in:
Reinout Meliesie 2025-02-12 14:32:16 +01:00
commit 2c40217497
Signed by: zedfrigg
GPG key ID: 3AFCC06481308BC6
5 changed files with 162 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/ui/collatable_container/collated_grid.rs
View file

@ -16,7 +16,7 @@ use crate :: ui :: component :: * ;
pub struct CollatedMediaGrid < A : MediaAdapter + 'static > {
pub struct CollatedMediaGrid < A : MediaAdapter > {
media_widget_pairs : RefCell < Vec < ( A :: Overview , Button ) > > ,
grid_widget : FlowBox ,
on_media_selected : & 'static dyn Fn ( A :: Overview ) ,
@ -29,7 +29,7 @@ impl < A : MediaAdapter > CollatedMediaGrid <A> {
@ homogeneous : true ;
@ selection_mode : SelectionMode :: None ;
) ;
let media_widget_pairs = RefCell :: new ( vec ! () ) ;
let media_widget_pairs = RefCell :: new ( Vec :: new () ) ;
let on_media_selected = leak (on_media_selected) ;
Self { media_widget_pairs , grid_widget , on_media_selected }
@ -127,8 +127,8 @@ impl < A : MediaAdapter > CollatedMediaGrid <A> {
self . media_widget_pairs . borrow () . as_slice () ,
) ;
sorted . sort_by ( | ( media_1 , _ ) , ( media_2 , _ ) |
A :: compare_by ( media_1 , media_2 , sorting ) ,
sorted . sort_by (
| ( media_1 , _ ) , ( media_2 , _ ) | A :: compare_by ( media_1 , media_2 , sorting ) ,
) ;
// See it, say it, ...