me/iced
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master' into feat/multi-window-support

Browse source 
# Conflicts:
#	native/src/command/action.rs
#	native/src/window/action.rs
#	winit/src/window.rs
This commit is contained in:
Bingus 2023-02-15 14:55:02 -08:00
commit 63fb608d8b
No known key found for this signature in database
GPG key ID: 5F84D2AA40A9F170
55 changed files with 1218 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

2
examples/integration_opengl/src/controls.rs
View file

@ -90,7 +90,7 @@ impl Program for Controls {
)
.push(sliders)
.push(
Text::new(format!("{:?}", background_color))
Text::new(format!("{background_color:?}"))
.size(14)
.style(Color::WHITE),
),

2
examples/integration_opengl/src/scene.rs
View file

@ -49,7 +49,7 @@ impl Scene {
.expect("Cannot create shader");
gl.shader_source(
shader,
&format!("{}\n{}", shader_version, shader_source),
&format!("{shader_version}\n{shader_source}"),
);
gl.compile_shader(shader);
if !gl.get_shader_compile_status(shader) {