Merge branch 'master' into feature/test-recorder
This commit is contained in:
commit
a052ce58b0
69 changed files with 1555 additions and 833 deletions
|
|
@ -379,7 +379,7 @@ impl<P: Program + 'static> Emulator<P> {
|
|||
program.view(&self.state, self.window)
|
||||
}
|
||||
|
||||
pub fn theme(&self, program: &P) -> P::Theme {
|
||||
pub fn theme(&self, program: &P) -> Option<P::Theme> {
|
||||
program.theme(&self.state, self.window)
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue