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

Rename Settings::background_color to background

Browse source
This commit is contained in:
Héctor Ramón Jiménez 2019-12-29 12:31:47 +01:00
parent f74ab463d4
commit 89a6b8a9a1
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/settings.rs
View file

@ -14,14 +14,14 @@ pub struct Settings {
/// The default background [`Color`] of the application /// The default background [`Color`] of the application
/// ///
/// [`Color`]: ../struct.Color.html /// [`Color`]: ../struct.Color.html
pub background_color: Color, pub background: Color,
} }
impl Default for Settings { impl Default for Settings {
fn default() -> Settings { fn default() -> Settings {
Settings { Settings {
window: Window::default(), window: Window::default(),
background_color: Color::WHITE, background: Color::WHITE,
} }
} }
} }
@ -59,7 +59,7 @@ impl From<Settings> for iced_winit::Settings {
decorations: settings.window.decorations, decorations: settings.window.decorations,
platform_specific: Default::default(), platform_specific: Default::default(),
}, },
background_color: settings.background_color, background: settings.background,
} }
} }
} }

2
winit/src/application.rs
View file

@ -280,7 +280,7 @@ pub trait Application: Sized {
} }
let new_mouse_cursor = renderer.draw( let new_mouse_cursor = renderer.draw(
settings.background_color, settings.background,
&primitive, &primitive,
&debug.overlay(), &debug.overlay(),
&mut target, &mut target,

4
winit/src/settings/mod.rs
View file

@ -19,14 +19,14 @@ pub struct Settings {
pub window: Window, pub window: Window,
/// The default background color of the application /// The default background color of the application
pub background_color: Color, pub background: Color,
} }
impl Default for Settings { impl Default for Settings {
fn default() -> Settings { fn default() -> Settings {
Settings { Settings {
window: Window::default(), window: Window::default(),
background_color: Color::WHITE, background: Color::WHITE,
} }
} }
} }