Compare commits
2 commits
540b3b8165
...
e90ae8e1cb
Author | SHA1 | Date | |
---|---|---|---|
e90ae8e1cb | |||
8b7f68232e |
1 changed files with 7 additions and 9 deletions
|
@ -729,13 +729,14 @@ impl GuiHandler {
|
|||
}
|
||||
|
||||
pub fn accept_custom_selection(
|
||||
&self,
|
||||
&mut self,
|
||||
commands: &mut Commands,
|
||||
gui_handler: &mut GuiHandler,
|
||||
button: ControllerButton,
|
||||
) -> Result<bool> {
|
||||
let callback_self = unsafe { remove_life_time_mut(self) };
|
||||
|
||||
if let Some(current_selectable) = &self.current_selectable {
|
||||
if current_selectable.custom_click_event(commands, gui_handler, button)? {
|
||||
if current_selectable.custom_click_event(commands, callback_self, button)? {
|
||||
return Ok(true);
|
||||
}
|
||||
}
|
||||
|
@ -934,16 +935,13 @@ impl GuiHandler {
|
|||
self.callback_list.push(Box::new(f));
|
||||
}
|
||||
|
||||
pub fn process_callbacks(
|
||||
&mut self,
|
||||
commands: &mut Commands,
|
||||
gui_handler: &mut GuiHandler,
|
||||
) -> Result<()> {
|
||||
pub fn process_callbacks(&mut self, commands: &mut Commands) -> Result<()> {
|
||||
let callback_self = unsafe { remove_life_time_mut(self) };
|
||||
let callbacks = mem::take(&mut self.callback_list);
|
||||
|
||||
callbacks
|
||||
.into_iter()
|
||||
.try_for_each(|callback| callback(commands, gui_handler))
|
||||
.try_for_each(|callback| callback(commands, callback_self))
|
||||
}
|
||||
|
||||
fn render(
|
||||
|
|
Loading…
Reference in a new issue