+29 -29

src/modules.rs

··· 45 45 }, 46 46 } 47 47 48 48 - pub fn get_connection<Message>(show_connection: &bool) -> Option<Element<'static, Message>> { 48 48 + pub fn get_connection<'a, Message>(show_connection: &bool) -> Option<Element<'a, Message>> { 49 49 match show_connection { 50 50 true => Some(small_icon(Bootstrap::Wifi).into()), 51 51 false => None, 52 52 } 53 53 } 54 54 55 55 - pub fn get_volume<Message>(show_volume: &bool) -> Option<Element<'static, Message>> { 55 55 + pub fn get_volume<'a, Message>(show_volume: &bool) -> Option<Element<'a, Message>> { 56 56 match show_volume { 57 57 true => Some(small_icon(Bootstrap::VolumeUpFill).into()), 58 58 false => None, 59 59 } 60 60 } 61 61 62 62 - pub fn get_power<Message>(show_power: &bool) -> Option<Element<'static, Message>> { 62 62 + pub fn get_power<'a, Message>(show_power: &bool) -> Option<Element<'a, Message>> { 63 63 match show_power { 64 64 true => Some(small_icon(Bootstrap::Battery).into()), 65 65 false => None, 66 66 } 67 67 } 68 68 - pub fn start_menu<Message>( 68 68 + pub fn start_menu<'a, Message>( 69 69 on_press: fn(ButtonInfo) -> Message, 70 70 vertical: &bool, 71 71 - ) -> Element<'static, Message> 71 71 + ) -> Element<'a, Message> 72 72 where 73 73 - Message: Clone + 'static, 73 73 + Message: Clone + 'a, 74 74 { 75 75 taskbar_button_with_info( 76 76 icon(Bootstrap::Microsoft), ··· 82 82 .into() 83 83 } 84 84 85 85 - pub fn workspaces<Message>(message: Message, vertical: &bool) -> Element<'static, Message> 85 85 + pub fn workspaces<'a, Message>(message: Message, vertical: &bool) -> Element<'a, Message> 86 86 where 87 87 - Message: Clone + 'static, 87 87 + Message: Clone + 'a, 88 88 { 89 89 taskbar_button( 90 90 icon(Bootstrap::Stack), ··· 96 96 .into() 97 97 } 98 98 99 99 - pub fn directory_menu<Message>( 99 99 + pub fn directory_menu<'a, Message>( 100 100 on_press: fn(ButtonInfo) -> Message, 101 101 vertical: &bool, 102 102 - ) -> Element<'static, Message> 102 102 + ) -> Element<'a, Message> 103 103 where 104 104 - Message: Clone + 'static, 104 104 + Message: Clone + 'a, 105 105 { 106 106 taskbar_button_with_info( 107 107 icon(Bootstrap::FolderFill), ··· 113 113 .into() 114 114 } 115 115 116 116 - pub fn system_tray<Message>( 116 116 + pub fn system_tray<'a, Message>( 117 117 on_press: fn(ButtonInfo) -> Message, 118 118 hidden_menu: &bool, 119 119 vertical: &bool, 120 120 position: config::Position, 121 121 - ) -> Element<'static, Message> 121 121 + ) -> Element<'a, Message> 122 122 where 123 123 - Message: Clone + 'static, 123 123 + Message: Clone + 'a, 124 124 { 125 125 let icon = match position { 126 126 config::Position::Top => small_icon(Bootstrap::ChevronDown), ··· 143 143 } 144 144 } 145 145 146 146 - pub fn notification_tray<Message>( 146 146 + pub fn notification_tray<'a, Message>( 147 147 on_press: fn(ButtonInfo) -> Message, 148 148 vertical: &bool, 149 149 - ) -> Element<'static, Message> 149 149 + ) -> Element<'a, Message> 150 150 where 151 151 - Message: Clone + 'static, 151 151 + Message: Clone + 'a, 152 152 { 153 153 taskbar_button_with_info( 154 154 small_icon(Bootstrap::Bell), ··· 160 160 .into() 161 161 } 162 162 163 163 - pub fn quick_settings<Message>( 163 163 + pub fn quick_settings<'a, Message>( 164 164 on_press: fn(ButtonInfo) -> Message, 165 165 - connection: Option<Element<'static, Message>>, 166 166 - volume: Option<Element<'static, Message>>, 167 167 - power: Option<Element<'static, Message>>, 165 165 + connection: Option<Element<'a, Message>>, 166 166 + volume: Option<Element<'a, Message>>, 167 167 + power: Option<Element<'a, Message>>, 168 168 vertical: &bool, 169 169 - ) -> Element<'static, Message> 169 169 + ) -> Element<'a, Message> 170 170 where 171 171 - Message: Clone + 'static, 171 171 + Message: Clone + 'a, 172 172 { 173 173 taskbar_button_with_info( 174 174 match vertical { ··· 256 256 (date, time) 257 257 } 258 258 259 259 - pub fn date_time<Message>( 259 259 + pub fn date_time<'a, Message>( 260 260 on_press: fn(ButtonInfo) -> Message, 261 261 datetime: DateTime<Local>, 262 262 mm_dd_yyyy: &bool, 263 263 military: &bool, 264 264 seconds: &bool, 265 265 vertical: &bool, 266 266 - ) -> Element<'static, Message> 266 266 + ) -> Element<'a, Message> 267 267 where 268 268 - Message: Clone + 'static, 268 268 + Message: Clone + 'a, 269 269 { 270 270 let (date, time) = get_time(datetime, mm_dd_yyyy, military, seconds); 271 271 ··· 289 289 .into() 290 290 } 291 291 292 292 - pub fn view_desktop<Message>( 292 292 + pub fn view_desktop<'a, Message>( 293 293 message: Message, 294 294 thin: &bool, 295 295 vertical: &bool, 296 296 - ) -> Element<'static, Message> 296 296 + ) -> Element<'a, Message> 297 297 where 298 298 - Message: Clone + 'static, 298 298 + Message: Clone + 'a, 299 299 { 300 300 match thin { 301 301 true => taskbar_button_thin(

+3 -3

src/panel.rs

··· 68 68 UserClosedWindow(iced::window::Id), 69 69 } 70 70 71 71 - pub fn label(string: &str) -> Text<'static> { 71 71 + pub fn label<'a>(string: &str) -> Text<'a> { 72 72 text(String::from(string)) 73 73 .font(Font::with_name("Selawik")) 74 74 .align_x(Alignment::Center) ··· 136 136 time::every(time::Duration::from_millis(200)).map(|_x| Message::PanelUpdatedTime) 137 137 } 138 138 139 139 - pub fn get_widget(&self, module: &Module) -> Element<Message> 139 139 + pub fn get_widget<'a>(&self, module: &Module) -> Element<Message> 140 140 where 141 141 - Message: Clone + 'static, 141 141 + Message: Clone + 'a, 142 142 { 143 143 match module { 144 144 Module::StartMenu => start_menu(

+2 -2

src/widgets.rs

··· 98 98 } 99 99 } 100 100 101 101 - pub fn icon(icon: iced_fonts::Bootstrap) -> Text<'static> { 101 101 + pub fn icon<'a>(icon: iced_fonts::Bootstrap) -> Text<'a> { 102 102 to_text(icon) 103 103 .size(24) 104 104 .align_x(Alignment::Center) 105 105 .align_y(Alignment::Center) 106 106 } 107 107 108 108 - pub fn small_icon(icon: iced_fonts::Bootstrap) -> Text<'static> { 108 108 + pub fn small_icon<'a>(icon: iced_fonts::Bootstrap) -> Text<'a> { 109 109 to_text(icon) 110 110 .size(18) 111 111 .align_x(Alignment::Center)