diff options
author | 2019-12-29 12:31:47 +0100 | |
---|---|---|
committer | 2019-12-29 12:31:47 +0100 | |
commit | 89a6b8a9a173e767753ec777fd83c912c1be5ea3 (patch) | |
tree | a21f6660667d61ab9823c2a3a8dd02671a44363e | |
parent | f74ab463d44dd0bb025b0cea466d2861576253dd (diff) | |
download | iced-89a6b8a9a173e767753ec777fd83c912c1be5ea3.tar.gz iced-89a6b8a9a173e767753ec777fd83c912c1be5ea3.tar.bz2 iced-89a6b8a9a173e767753ec777fd83c912c1be5ea3.zip |
Rename `Settings::background_color` to `background`
-rw-r--r-- | src/settings.rs | 6 | ||||
-rw-r--r-- | winit/src/application.rs | 2 | ||||
-rw-r--r-- | winit/src/settings/mod.rs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/settings.rs b/src/settings.rs index 8da8948c..4ae18a14 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -14,14 +14,14 @@ pub struct Settings { /// The default background [`Color`] of the application /// /// [`Color`]: ../struct.Color.html - pub background_color: Color, + pub background: Color, } impl Default for Settings { fn default() -> Settings { Settings { 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, platform_specific: Default::default(), }, - background_color: settings.background_color, + background: settings.background, } } } diff --git a/winit/src/application.rs b/winit/src/application.rs index 50060b11..56f17573 100644 --- a/winit/src/application.rs +++ b/winit/src/application.rs @@ -280,7 +280,7 @@ pub trait Application: Sized { } let new_mouse_cursor = renderer.draw( - settings.background_color, + settings.background, &primitive, &debug.overlay(), &mut target, diff --git a/winit/src/settings/mod.rs b/winit/src/settings/mod.rs index 1f9f1502..0384df32 100644 --- a/winit/src/settings/mod.rs +++ b/winit/src/settings/mod.rs @@ -19,14 +19,14 @@ pub struct Settings { pub window: Window, /// The default background color of the application - pub background_color: Color, + pub background: Color, } impl Default for Settings { fn default() -> Settings { Settings { window: Window::default(), - background_color: Color::WHITE, + background: Color::WHITE, } } } |