diff options
| author |  Héctor Ramón Jiménez <hector@hecrj.dev> | 2023-10-27 03:58:45 +0200 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector@hecrj.dev> | 2023-10-27 03:58:45 +0200 |
| commit | 65823875791ecebf24d049cc0782e7475a37899b (patch) | |
| tree | 1088c656ef7ad9782374952045022d2c104931b2 /examples/integration/src | |
| parent | 8cc19de254c37d3123d5ea1b6513f1f34d35c7c8 (diff) | |
| parent | f1b1344d59fa7354615f560bd25ed01ad0c9f865 (diff) | |
| download | iced-65823875791ecebf24d049cc0782e7475a37899b.tar.gz iced-65823875791ecebf24d049cc0782e7475a37899b.tar.bz2 iced-65823875791ecebf24d049cc0782e7475a37899b.zip | |
Merge branch 'master' into text-editor
Diffstat (limited to 'examples/integration/src')
| -rw-r--r-- | examples/integration/src/controls.rs | 2 | ||||
| -rw-r--r-- | examples/integration/src/main.rs | 2 | ||||
| -rw-r--r-- | examples/integration/src/scene.rs | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/examples/integration/src/controls.rs b/examples/integration/src/controls.rs index 14e53ede..4714c397 100644 --- a/examples/integration/src/controls.rs +++ b/examples/integration/src/controls.rs @@ -19,7 +19,7 @@ impl Controls { pub fn new() -> Controls { Controls { background_color: Color::BLACK, - text: Default::default(), + text: String::default(), } } diff --git a/examples/integration/src/main.rs b/examples/integration/src/main.rs index 7945bd20..c26d52fe 100644 --- a/examples/integration/src/main.rs +++ b/examples/integration/src/main.rs @@ -254,7 +254,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> { { // We clear the frame - let mut render_pass = scene.clear( + let mut render_pass = Scene::clear( &view, &mut encoder, program.background_color(), diff --git a/examples/integration/src/scene.rs b/examples/integration/src/scene.rs index 90c7efbf..01808f40 100644 --- a/examples/integration/src/scene.rs +++ b/examples/integration/src/scene.rs @@ -16,7 +16,6 @@ impl Scene { } pub fn clear<'a>( - &self, target: &'a wgpu::TextureView, encoder: &'a mut wgpu::CommandEncoder, background_color: Color, |