@@ -2537,7 +2537,6 @@ impl<T: 'static> WindowState<T> {
25372537 {
25382538 output = Some ( cache. clone ( ) ) ;
25392539 }
2540- // self.xdg_info_cache.clear();
25412540 let binded_output = output. as_ref ( ) . map ( |( output, _) | output) . cloned ( ) ;
25422541 let binded_xdginfo = output. as_ref ( ) . map ( |( _, xdginfo) | xdginfo) . cloned ( ) ;
25432542 ( binded_output, binded_xdginfo)
@@ -2920,15 +2919,6 @@ impl<T: 'static> WindowState<T> {
29202919 }
29212920 }
29222921
2923- //let mut local_events = events.lock().expect(
2924- // "This events only used in this callback, so it should always can be unlocked",
2925- //);
2926- //let mut swapped_events: Vec<Message> = vec![];
2927- //std::mem::swap(&mut *local_events, &mut swapped_events);
2928- //drop(local_events);
2929- //for event in swapped_events {
2930- // window_state.handle_event(&mut *event_handler, LayerShellEvent::UserEvent(event), None);
2931- //}
29322922 window_state. handle_event (
29332923 & mut * event_handler,
29342924 LayerShellEvent :: NormalDispatch ,
@@ -2972,13 +2962,11 @@ impl<T: 'static> WindowState<T> {
29722962 ) ) => {
29732963 let output = match output_type {
29742964 OutputOption :: Output ( output) => Some ( output) ,
2975- OutputOption :: OutputName ( name) => {
2976- window_state
2977- . xdg_info_cache
2978- . iter ( )
2979- . find ( |( _, info) | info. name == * name)
2980- . map ( |( output, _) | output. clone ( ) )
2981- }
2965+ OutputOption :: OutputName ( name) => window_state
2966+ . xdg_info_cache
2967+ . iter ( )
2968+ . find ( |( _, info) | info. name == * name)
2969+ . map ( |( output, _) | output. clone ( ) ) ,
29822970 _ => {
29832971 let pos = window_state. surface_pos ( ) ;
29842972
0 commit comments