remove typed stuff / just specify rsc if needed
This commit is contained in:
@@ -127,6 +127,12 @@ impl<State: 'static> HasEvents for DefaultRsc<State> {
|
||||
}
|
||||
}
|
||||
|
||||
impl<State: 'static> HasTasks for DefaultRsc<State> {
|
||||
fn tasks_mut(&mut self) -> &mut Tasks<Self> {
|
||||
&mut self.tasks
|
||||
}
|
||||
}
|
||||
|
||||
pub struct DefaultApp<State: DefaultAppState> {
|
||||
rsc: DefaultRsc<State>,
|
||||
state: State,
|
||||
@@ -169,7 +175,7 @@ impl<State: DefaultAppState> AppState for DefaultApp<State> {
|
||||
if input_changed {
|
||||
let window_size = ui_state.window_size();
|
||||
self.rsc
|
||||
.run_sensors(&mut self.state, &cursor_state, window_size);
|
||||
.run_sensors(&mut self.state, cursor_state, window_size);
|
||||
}
|
||||
let ui = &mut self.rsc.ui;
|
||||
let ui_state = self.state.default_state_mut();
|
||||
@@ -200,13 +206,13 @@ impl<State: DefaultAppState> AppState for DefaultApp<State> {
|
||||
ui_state.window.set_ime_allowed(false);
|
||||
}
|
||||
TextInputResult::Submit => {
|
||||
self.rsc.run_event::<Submit>(sel, &mut (), &mut self.state);
|
||||
self.rsc.run_event::<Submit>(sel, (), &mut self.state);
|
||||
}
|
||||
TextInputResult::Paste => {
|
||||
if let Ok(t) = ui_state.clipboard.get_text() {
|
||||
text.insert(&t);
|
||||
}
|
||||
self.rsc.run_event::<Edited>(sel, &mut (), &mut self.state);
|
||||
self.rsc.run_event::<Edited>(sel, (), &mut self.state);
|
||||
}
|
||||
TextInputResult::Copy(text) => {
|
||||
if let Err(err) = ui_state.clipboard.set_text(text) {
|
||||
@@ -214,7 +220,7 @@ impl<State: DefaultAppState> AppState for DefaultApp<State> {
|
||||
}
|
||||
}
|
||||
TextInputResult::Used => {
|
||||
self.rsc.run_event::<Edited>(sel, &mut (), &mut self.state);
|
||||
self.rsc.run_event::<Edited>(sel, (), &mut self.state);
|
||||
}
|
||||
TextInputResult::Unused => {}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user