Fix compilation of screenshot example (merge race)
This commit is contained in:
parent
7987920f7e
commit
42edb92232
1 changed files with 5 additions and 1 deletions
|
@ -27,7 +27,11 @@ impl eframe::App for MyApp {
|
||||||
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
|
fn update(&mut self, ctx: &egui::Context, _frame: &mut eframe::Frame) {
|
||||||
egui::CentralPanel::default().show(ctx, |ui| {
|
egui::CentralPanel::default().show(ctx, |ui| {
|
||||||
if let Some(screenshot) = self.screenshot.take() {
|
if let Some(screenshot) = self.screenshot.take() {
|
||||||
self.texture = Some(ui.ctx().load_texture("screenshot", screenshot));
|
self.texture = Some(ui.ctx().load_texture(
|
||||||
|
"screenshot",
|
||||||
|
screenshot,
|
||||||
|
egui::TextureFilter::Linear,
|
||||||
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
ui.horizontal(|ui| {
|
ui.horizontal(|ui| {
|
||||||
|
|
Loading…
Reference in a new issue